From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/core/Alteration.c | 2447 ++++++----- src/core/ContainerSourceCollection.c | 1678 ++++---- src/core/Core.c | 15 +- src/core/DataCollection.c | 3118 +++++++------- src/core/DataObject.c | 446 +- src/core/DataSet.c | 750 ++-- src/core/DataSource.c | 3291 ++++++++------- src/core/DataSourceTypes.c | 547 ++- src/core/DataView.c | 329 +- src/core/DataViewTypes.c | 240 +- src/core/DatabaseSourceCollection.c | 633 +-- src/core/SourceCollection.c | 1300 +++--- src/core/SourceHoldingTank.c | 1324 +++--- src/core/SourceInterfaces.c | 240 +- src/core/Tracker.c | 1569 +++---- src/core/ViewCollection.c | 7443 +++++++++++++++++----------------- src/core/util.c | 1048 +++-- 17 files changed, 13823 insertions(+), 12595 deletions(-) (limited to 'src/core') diff --git a/src/core/Alteration.c b/src/core/Alteration.c index 173f45f..a6d9ad0 100644 --- a/src/core/Alteration.c +++ b/src/core/Alteration.c @@ -1,4 +1,4 @@ -/* Alteration.c generated by valac 0.36.6, the Vala compiler +/* Alteration.c generated by valac 0.40.4, the Vala compiler * generated from Alteration.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -26,6 +26,7 @@ /* Recommended subjects include: image, thumbnail, metadata.*/ /**/ + #include #include #include @@ -78,49 +79,81 @@ static gpointer alteration_parent_class = NULL; 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; #define ALTERATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ALTERATION, AlterationPrivate)) -enum { - ALTERATION_DUMMY_PROPERTY -}; -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); -static void alteration_add_detail (Alteration* self, const gchar* sub, const gchar* det); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); +static void alteration_add_detail (Alteration* self, + const gchar* sub, + const gchar* det); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); -Alteration* alteration_new_from_array (gchar** array, int array_length1); -Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); +Alteration* alteration_new_from_array (gchar** array, + int array_length1); +Alteration* alteration_construct_from_array (GType object_type, + gchar** array, + int array_length1); static Alteration* alteration_new_from_map (GeeMultiMap* map); -static Alteration* alteration_construct_from_map (GType object_type, GeeMultiMap* map); +static Alteration* alteration_construct_from_map (GType object_type, + GeeMultiMap* map); static GeeMultiMap* alteration_create_map (Alteration* self); static guint alteration_case_hash (const gchar* a); -static guint _alteration_case_hash_gee_hash_data_func (gconstpointer v, gpointer self); -static gboolean alteration_case_equal (const gchar* a, const gchar* b); -static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -static inline gboolean alteration_equal_values (const gchar* str1, const gchar* str2); +static guint _alteration_case_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +static gboolean alteration_case_equal (const gchar* a, + const gchar* b); +static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +static inline gboolean alteration_equal_values (const gchar* str1, + const gchar* str2); static inline guint alteration_hash_value (const gchar* str); -gboolean alteration_has_subject (Alteration* self, const gchar* subject); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -GeeCollection* alteration_get_details (Alteration* self, const gchar* subject); +gboolean alteration_has_subject (Alteration* self, + const gchar* subject); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +GeeCollection* alteration_get_details (Alteration* self, + const gchar* subject); gchar* alteration_to_string (Alteration* self); -gboolean alteration_contains_any (Alteration* self, Alteration* other); -gboolean alteration_equals (Alteration* self, Alteration* other); -static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src); -Alteration* alteration_compress (Alteration* self, Alteration* other); +gboolean alteration_contains_any (Alteration* self, + Alteration* other); +gboolean alteration_equals (Alteration* self, + Alteration* other); +static void alteration_multimap_add_all (GeeMultiMap* dest, + GeeMultiMap* src); +Alteration* alteration_compress (Alteration* self, + Alteration* other); static void alteration_finalize (Alteration * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail) { +Alteration* +alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail) +{ Alteration* self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (subject != NULL, NULL); #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -128,141 +161,137 @@ Alteration* alteration_construct (GType object_type, const gchar* subject, const #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 33 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = subject; -#line 33 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = detail; -#line 33 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_add_detail (self, _tmp0_, _tmp1_); + alteration_add_detail (self, subject, detail); #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 139 "Alteration.c" +#line 168 "Alteration.c" } -Alteration* alteration_new (const gchar* subject, const gchar* detail) { +Alteration* +alteration_new (const gchar* subject, + const gchar* detail) +{ #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct (TYPE_ALTERATION, subject, detail); -#line 146 "Alteration.c" +#line 178 "Alteration.c" } -Alteration* alteration_construct_from_list (GType object_type, const gchar* list) { +Alteration* +alteration_construct_from_list (GType object_type, + const gchar* list) +{ Alteration* self = NULL; - const gchar* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gchar** pairs = NULL; - const gchar* _tmp3_; - gchar** _tmp4_; - gchar** _tmp5_; + gchar** _tmp2_; + gchar** _tmp3_; gint pairs_length1; gint _pairs_size_; - gchar** _tmp6_; - gint _tmp6__length1; - gchar** _tmp7_; - gint _tmp7__length1; + gchar** _tmp4_; + gint _tmp4__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (list != NULL, NULL); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = list; -#line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = strlen (_tmp0_); + _tmp0_ = strlen (list); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_return_val_if_fail (_tmp2_ > 0, "list.length > 0", NULL); + _vala_return_val_if_fail (_tmp1_ > 0, "list.length > 0", NULL); #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = list; + _tmp3_ = _tmp2_ = g_strsplit (list, ",", 0); #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ",", 0); + pairs = _tmp3_; #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pairs = _tmp5_; -#line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pairs_length1 = _vala_array_length (_tmp4_); + pairs_length1 = _vala_array_length (_tmp2_); #line 39 "/home/jens/Source/shotwell/src/core/Alteration.vala" _pairs_size_ = pairs_length1; #line 40 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = pairs; + _tmp4_ = pairs; #line 40 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6__length1 = pairs_length1; + _tmp4__length1 = pairs_length1; #line 40 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp6__length1 >= 1, "pairs.length >= 1"); + _vala_assert (_tmp4__length1 >= 1, "pairs.length >= 1"); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = pairs; + _tmp5_ = pairs; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7__length1 = pairs_length1; -#line 197 "Alteration.c" + _tmp5__length1 = pairs_length1; +#line 226 "Alteration.c" { gchar** pair_collection = NULL; gint pair_collection_length1 = 0; gint _pair_collection_size_ = 0; gint pair_it = 0; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection = _tmp7_; + pair_collection = _tmp5_; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection_length1 = _tmp7__length1; + pair_collection_length1 = _tmp5__length1; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - for (pair_it = 0; pair_it < _tmp7__length1; pair_it = pair_it + 1) { -#line 209 "Alteration.c" - gchar* _tmp8_; + for (pair_it = 0; pair_it < _tmp5__length1; pair_it = pair_it + 1) { +#line 238 "Alteration.c" + gchar* _tmp6_; gchar* pair = NULL; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = g_strdup (pair_collection[pair_it]); + _tmp6_ = g_strdup (pair_collection[pair_it]); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair = _tmp8_; -#line 216 "Alteration.c" + pair = _tmp6_; +#line 245 "Alteration.c" { gchar** subject_detail = NULL; - const gchar* _tmp9_; - gchar** _tmp10_; - gchar** _tmp11_; + const gchar* _tmp7_; + gchar** _tmp8_; + gchar** _tmp9_; gint subject_detail_length1; gint _subject_detail_size_; - gchar** _tmp12_; - gint _tmp12__length1; + gchar** _tmp10_; + gint _tmp10__length1; + gchar** _tmp11_; + gint _tmp11__length1; + const gchar* _tmp12_; gchar** _tmp13_; gint _tmp13__length1; const gchar* _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; - const gchar* _tmp16_; #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = pair; + _tmp7_ = pair; #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = _tmp10_ = g_strsplit (_tmp9_, ":", 2); + _tmp9_ = _tmp8_ = g_strsplit (_tmp7_, ":", 2); #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail = _tmp11_; + subject_detail = _tmp9_; #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail_length1 = _vala_array_length (_tmp10_); + subject_detail_length1 = _vala_array_length (_tmp8_); #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" _subject_detail_size_ = subject_detail_length1; #line 44 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = subject_detail; + _tmp10_ = subject_detail; #line 44 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12__length1 = subject_detail_length1; + _tmp10__length1 = subject_detail_length1; #line 44 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp12__length1 == 2, "subject_detail.length == 2"); + _vala_assert (_tmp10__length1 == 2, "subject_detail.length == 2"); #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = subject_detail; + _tmp11_ = subject_detail; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13__length1 = subject_detail_length1; + _tmp11__length1 = subject_detail_length1; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = _tmp13_[0]; + _tmp12_ = _tmp11_[0]; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = subject_detail; + _tmp13_ = subject_detail; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15__length1 = subject_detail_length1; + _tmp13__length1 = subject_detail_length1; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = _tmp15_[1]; + _tmp14_ = _tmp13_[1]; #line 46 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_add_detail (self, _tmp14_, _tmp16_); + alteration_add_detail (self, _tmp12_, _tmp14_); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" subject_detail = (_vala_array_free (subject_detail, subject_detail_length1, (GDestroyNotify) g_free), NULL); #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (pair); -#line 266 "Alteration.c" +#line 295 "Alteration.c" } } } @@ -270,200 +299,205 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list pairs = (_vala_array_free (pairs, pairs_length1, (GDestroyNotify) g_free), NULL); #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 274 "Alteration.c" +#line 303 "Alteration.c" } -Alteration* alteration_new_from_list (const gchar* list) { +Alteration* +alteration_new_from_list (const gchar* list) +{ #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct_from_list (TYPE_ALTERATION, list); -#line 281 "Alteration.c" +#line 312 "Alteration.c" } -Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1) { +Alteration* +alteration_construct_from_array (GType object_type, + gchar** array, + int array_length1) +{ Alteration* self = NULL; - gchar** _tmp0_; - gint _tmp0__length1; - gchar** _tmp1_; - gint _tmp1__length1; #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = array; -#line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0__length1 = array_length1; -#line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_return_val_if_fail (_tmp0__length1 > 0, "array.length > 0", NULL); -#line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = array; -#line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1__length1 = array_length1; -#line 303 "Alteration.c" + _vala_return_val_if_fail (array_length1 > 0, "array.length > 0", NULL); +#line 326 "Alteration.c" { gchar** pair_collection = NULL; gint pair_collection_length1 = 0; gint _pair_collection_size_ = 0; gint pair_it = 0; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection = _tmp1_; + pair_collection = array; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair_collection_length1 = _tmp1__length1; + pair_collection_length1 = array_length1; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - for (pair_it = 0; pair_it < _tmp1__length1; pair_it = pair_it + 1) { -#line 315 "Alteration.c" - gchar* _tmp2_; + for (pair_it = 0; pair_it < array_length1; pair_it = pair_it + 1) { +#line 338 "Alteration.c" + gchar* _tmp0_; gchar* pair = NULL; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = g_strdup (pair_collection[pair_it]); + _tmp0_ = g_strdup (pair_collection[pair_it]); #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" - pair = _tmp2_; -#line 322 "Alteration.c" + pair = _tmp0_; +#line 345 "Alteration.c" { gchar** subject_detail = NULL; - const gchar* _tmp3_; - gchar** _tmp4_; - gchar** _tmp5_; + const gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; gint subject_detail_length1; gint _subject_detail_size_; - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp4_; + gint _tmp4__length1; + gchar** _tmp5_; + gint _tmp5__length1; + const gchar* _tmp6_; gchar** _tmp7_; gint _tmp7__length1; const gchar* _tmp8_; - gchar** _tmp9_; - gint _tmp9__length1; - const gchar* _tmp10_; #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = pair; + _tmp1_ = pair; #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 2); + _tmp3_ = _tmp2_ = g_strsplit (_tmp1_, ":", 2); #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail = _tmp5_; + subject_detail = _tmp3_; #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject_detail_length1 = _vala_array_length (_tmp4_); + subject_detail_length1 = _vala_array_length (_tmp2_); #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" _subject_detail_size_ = subject_detail_length1; #line 55 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = subject_detail; + _tmp4_ = subject_detail; #line 55 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6__length1 = subject_detail_length1; + _tmp4__length1 = subject_detail_length1; #line 55 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp6__length1 == 2, "subject_detail.length == 2"); + _vala_assert (_tmp4__length1 == 2, "subject_detail.length == 2"); #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = subject_detail; + _tmp5_ = subject_detail; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7__length1 = subject_detail_length1; + _tmp5__length1 = subject_detail_length1; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = _tmp7_[0]; + _tmp6_ = _tmp5_[0]; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = subject_detail; + _tmp7_ = subject_detail; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9__length1 = subject_detail_length1; + _tmp7__length1 = subject_detail_length1; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp9_[1]; + _tmp8_ = _tmp7_[1]; #line 57 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_add_detail (self, _tmp8_, _tmp10_); + alteration_add_detail (self, _tmp6_, _tmp8_); #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" subject_detail = (_vala_array_free (subject_detail, subject_detail_length1, (GDestroyNotify) g_free), NULL); #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (pair); -#line 372 "Alteration.c" +#line 395 "Alteration.c" } } } #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 378 "Alteration.c" +#line 401 "Alteration.c" } -Alteration* alteration_new_from_array (gchar** array, int array_length1) { +Alteration* +alteration_new_from_array (gchar** array, + int array_length1) +{ #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct_from_array (TYPE_ALTERATION, array, array_length1); -#line 385 "Alteration.c" +#line 411 "Alteration.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self ? g_object_ref (self) : NULL; -#line 392 "Alteration.c" +#line 420 "Alteration.c" } -static Alteration* alteration_construct_from_map (GType object_type, GeeMultiMap* map) { +static Alteration* +alteration_construct_from_map (GType object_type, + GeeMultiMap* map) +{ Alteration* self = NULL; GeeMultiMap* _tmp0_; - GeeMultiMap* _tmp1_; #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (GEE_IS_MULTI_MAP (map), NULL); #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = (Alteration*) g_type_create_instance (object_type); #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = map; -#line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (map); #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (self->priv->map); #line 63 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->map = _tmp1_; + self->priv->map = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self; -#line 414 "Alteration.c" +#line 442 "Alteration.c" } -static Alteration* alteration_new_from_map (GeeMultiMap* map) { +static Alteration* +alteration_new_from_map (GeeMultiMap* map) +{ #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala" return alteration_construct_from_map (TYPE_ALTERATION, map); -#line 421 "Alteration.c" +#line 451 "Alteration.c" } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 444 "Alteration.c" +#line 476 "Alteration.c" } -static void alteration_add_detail (Alteration* self, const gchar* sub, const gchar* det) { +static void +alteration_add_detail (Alteration* self, + const gchar* sub, + const gchar* det) +{ gchar* subject = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; gchar* detail = NULL; + gchar* _tmp4_; const gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; - gint _tmp8_; - gint _tmp9_; - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_; - GeeMultiMap* _tmp18_; - const gchar* _tmp20_; - GeeMultiMap* _tmp25_; - const gchar* _tmp26_; - const gchar* _tmp27_; + gint _tmp6_; + gint _tmp7_; + gboolean _tmp8_ = FALSE; + const gchar* _tmp9_; + GeeMultiMap* _tmp16_; + const gchar* _tmp18_; + GeeMultiMap* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (IS_ALTERATION (self)); #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -471,120 +505,116 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (det != NULL); #line 68 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = sub; -#line 68 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = string_strip (_tmp0_); + _tmp0_ = string_strip (sub); #line 68 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject = _tmp1_; + subject = _tmp0_; #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = subject; + _tmp1_ = subject; #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = strlen (_tmp2_); + _tmp2_ = strlen (_tmp1_); #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 69 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp4_ > 0, "subject.length > 0"); -#line 71 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = det; + _vala_assert (_tmp3_ > 0, "subject.length > 0"); #line 71 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = string_strip (_tmp5_); + _tmp4_ = string_strip (det); #line 71 "/home/jens/Source/shotwell/src/core/Alteration.vala" - detail = _tmp6_; + detail = _tmp4_; #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = detail; + _tmp5_ = detail; #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = strlen (_tmp7_); + _tmp6_ = strlen (_tmp5_); #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 72 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp9_ > 0, "detail.length > 0"); + _vala_assert (_tmp7_ > 0, "detail.length > 0"); #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->subject; + _tmp9_ = self->priv->subject; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp11_ == NULL) { -#line 506 "Alteration.c" - GeeMultiMap* _tmp12_; + if (_tmp9_ == NULL) { +#line 536 "Alteration.c" + GeeMultiMap* _tmp10_; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = self->priv->map; + _tmp10_ = self->priv->map; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp12_ == NULL; -#line 512 "Alteration.c" + _tmp8_ = _tmp10_ == NULL; +#line 542 "Alteration.c" } else { #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = FALSE; -#line 516 "Alteration.c" + _tmp8_ = FALSE; +#line 546 "Alteration.c" } #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp10_) { -#line 520 "Alteration.c" - const gchar* _tmp13_; + if (_tmp8_) { +#line 550 "Alteration.c" + const gchar* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; const gchar* _tmp14_; gchar* _tmp15_; - const gchar* _tmp16_; - gchar* _tmp17_; #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = self->priv->detail; + _tmp11_ = self->priv->detail; #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp13_ == NULL, "this.detail == null"); + _vala_assert (_tmp11_ == NULL, "this.detail == null"); #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = subject; + _tmp12_ = subject; #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp13_ = g_strdup (_tmp12_); #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (self->priv->subject); #line 78 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->subject = _tmp15_; + self->priv->subject = _tmp13_; #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = detail; + _tmp14_ = detail; #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp15_ = g_strdup (_tmp14_); #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (self->priv->detail); #line 79 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->detail = _tmp17_; + self->priv->detail = _tmp15_; #line 81 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (detail); #line 81 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); #line 81 "/home/jens/Source/shotwell/src/core/Alteration.vala" return; -#line 552 "Alteration.c" +#line 582 "Alteration.c" } #line 85 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = self->priv->map; + _tmp16_ = self->priv->map; #line 85 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp18_ == NULL) { -#line 558 "Alteration.c" - GeeMultiMap* _tmp19_; + if (_tmp16_ == NULL) { +#line 588 "Alteration.c" + GeeMultiMap* _tmp17_; #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = alteration_create_map (self); + _tmp17_ = alteration_create_map (self); #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (self->priv->map); #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" - self->priv->map = _tmp19_; -#line 566 "Alteration.c" + self->priv->map = _tmp17_; +#line 596 "Alteration.c" } #line 89 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = self->priv->subject; + _tmp18_ = self->priv->subject; #line 89 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp20_ != NULL) { -#line 572 "Alteration.c" + if (_tmp18_ != NULL) { +#line 602 "Alteration.c" + const gchar* _tmp19_; + GeeMultiMap* _tmp20_; const gchar* _tmp21_; - GeeMultiMap* _tmp22_; - const gchar* _tmp23_; - const gchar* _tmp24_; + const gchar* _tmp22_; #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = self->priv->detail; + _tmp19_ = self->priv->detail; #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp21_ != NULL, "this.detail != null"); + _vala_assert (_tmp19_ != NULL, "this.detail != null"); #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = self->priv->map; + _tmp20_ = self->priv->map; #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = self->priv->subject; + _tmp21_ = self->priv->subject; #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = self->priv->detail; + _tmp22_ = self->priv->detail; #line 92 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp22_, _tmp23_, _tmp24_); + gee_multi_map_set (_tmp20_, _tmp21_, _tmp22_); #line 93 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (self->priv->subject); #line 93 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -593,43 +623,52 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch _g_free0 (self->priv->detail); #line 94 "/home/jens/Source/shotwell/src/core/Alteration.vala" self->priv->detail = NULL; -#line 597 "Alteration.c" +#line 627 "Alteration.c" } #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = self->priv->map; + _tmp23_ = self->priv->map; #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = subject; + _tmp24_ = subject; #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = detail; + _tmp25_ = detail; #line 98 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp25_, _tmp26_, _tmp27_); + gee_multi_map_set (_tmp23_, _tmp24_, _tmp25_); #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (detail); #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); -#line 611 "Alteration.c" +#line 641 "Alteration.c" } -static guint _alteration_case_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_alteration_case_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = alteration_case_hash ((const gchar*) v); #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 620 "Alteration.c" +#line 653 "Alteration.c" } -static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_alteration_case_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = alteration_case_equal ((const gchar*) a, (const gchar*) b); #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 629 "Alteration.c" +#line 666 "Alteration.c" } -static GeeMultiMap* alteration_create_map (Alteration* self) { +static GeeMultiMap* +alteration_create_map (Alteration* self) +{ GeeMultiMap* result = NULL; GeeHashMultiMap* _tmp0_; #line 101 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -640,97 +679,80 @@ static GeeMultiMap* alteration_create_map (Alteration* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 644 "Alteration.c" +#line 683 "Alteration.c" } -static gboolean alteration_case_equal (const gchar* a, const gchar* b) { +static gboolean +alteration_case_equal (const gchar* a, + const gchar* b) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; -#line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = a; #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = b; -#line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = alteration_equal_values (_tmp0_, _tmp1_); -#line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_; + result = alteration_equal_values (a, b); #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 663 "Alteration.c" +#line 696 "Alteration.c" } -static guint alteration_case_hash (const gchar* a) { +static guint +alteration_case_hash (const gchar* a) +{ guint result = 0U; - const gchar* _tmp0_; - guint _tmp1_; -#line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = a; -#line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = alteration_hash_value (_tmp0_); #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp1_; + result = alteration_hash_value (a); #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 679 "Alteration.c" +#line 708 "Alteration.c" } -static inline gboolean alteration_equal_values (const gchar* str1, const gchar* str2) { +static inline gboolean +alteration_equal_values (const gchar* str1, + const gchar* str2) +{ gboolean result = FALSE; - const gchar* _tmp0_; - const gchar* _tmp1_; - gint _tmp2_; #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (str1 != NULL, FALSE); #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (str2 != NULL, FALSE); #line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = str1; -#line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = str2; -#line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = g_ascii_strcasecmp (_tmp0_, _tmp1_); -#line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_ == 0; + result = g_ascii_strcasecmp (str1, str2) == 0; #line 114 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 702 "Alteration.c" +#line 725 "Alteration.c" } -static inline guint alteration_hash_value (const gchar* str) { +static inline guint +alteration_hash_value (const gchar* str) +{ guint result = 0U; GHashFunc _tmp0_; - const gchar* _tmp1_; - guint _tmp2_; #line 117 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (str != NULL, 0U); #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = g_str_hash; #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = str; -#line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp0_ (_tmp1_); -#line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_; + result = _tmp0_ (str); #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 723 "Alteration.c" +#line 742 "Alteration.c" } -gboolean alteration_has_subject (Alteration* self, const gchar* subject) { +gboolean +alteration_has_subject (Alteration* self, + const gchar* subject) +{ gboolean result = FALSE; const gchar* _tmp0_; - GeeMultiMap* _tmp4_; + GeeMultiMap* _tmp2_; GeeSet* keys = NULL; - GeeMultiMap* _tmp5_; - GeeSet* _tmp6_; - GeeSet* _tmp7_; + GeeMultiMap* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -739,82 +761,67 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { _tmp0_ = self->priv->subject; #line 122 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_ != NULL) { -#line 743 "Alteration.c" +#line 765 "Alteration.c" const gchar* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp1_ = self->priv->subject; #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = subject; -#line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = alteration_equal_values (_tmp1_, _tmp2_); -#line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp3_; + result = alteration_equal_values (_tmp1_, subject); #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 757 "Alteration.c" +#line 773 "Alteration.c" } #line 125 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = self->priv->map; + _tmp2_ = self->priv->map; #line 125 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp4_ != NULL, "map != null"); + _vala_assert (_tmp2_ != NULL, "map != null"); #line 126 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = self->priv->map; + _tmp3_ = self->priv->map; #line 126 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = gee_multi_map_get_keys (_tmp5_); + _tmp4_ = gee_multi_map_get_keys (_tmp3_); #line 126 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp6_; + keys = _tmp4_; #line 127 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = keys; + _tmp5_ = keys; #line 127 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp7_ != NULL) { -#line 773 "Alteration.c" + if (_tmp5_ != NULL) { +#line 789 "Alteration.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp8_; - GeeIterator* _tmp9_; + GeeSet* _tmp6_; + GeeIterator* _tmp7_; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = keys; + _tmp6_ = keys; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _key_it = _tmp9_; + _key_it = _tmp7_; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 786 "Alteration.c" - GeeIterator* _tmp10_; - gboolean _tmp11_; +#line 802 "Alteration.c" + GeeIterator* _tmp8_; gchar* key = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; - gboolean _tmp16_; -#line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _key_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + const gchar* _tmp11_; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = gee_iterator_next (_tmp10_); + _tmp8_ = _key_it; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp8_)) { #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 803 "Alteration.c" +#line 814 "Alteration.c" } #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = _key_it; + _tmp9_ = _key_it; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp13_; -#line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = key; + key = (gchar*) _tmp10_; #line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = subject; + _tmp11_ = key; #line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = alteration_equal_values (_tmp14_, _tmp15_); -#line 129 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp16_) { + if (alteration_equal_values (_tmp11_, subject)) { #line 130 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 130 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -825,15 +832,15 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { _g_object_unref0 (keys); #line 130 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 829 "Alteration.c" +#line 836 "Alteration.c" } #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 833 "Alteration.c" +#line 840 "Alteration.c" } #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 837 "Alteration.c" +#line 844 "Alteration.c" } } #line 134 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -842,20 +849,23 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { _g_object_unref0 (keys); #line 134 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 846 "Alteration.c" +#line 853 "Alteration.c" } -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail) { +gboolean +alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; const gchar* _tmp1_; - GeeMultiMap* _tmp10_; + GeeMultiMap* _tmp6_; GeeCollection* values = NULL; - GeeMultiMap* _tmp11_; - const gchar* _tmp12_; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + GeeMultiMap* _tmp7_; + GeeCollection* _tmp8_; + GeeCollection* _tmp9_; #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -866,119 +876,96 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc _tmp1_ = self->priv->subject; #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp1_ != NULL) { -#line 870 "Alteration.c" +#line 880 "Alteration.c" const gchar* _tmp2_; #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp2_ = self->priv->detail; #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = _tmp2_ != NULL; -#line 876 "Alteration.c" +#line 886 "Alteration.c" } else { #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = FALSE; -#line 880 "Alteration.c" +#line 890 "Alteration.c" } #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_) { -#line 884 "Alteration.c" +#line 894 "Alteration.c" gboolean _tmp3_ = FALSE; const gchar* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp4_ = self->priv->subject; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = subject; -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = alteration_equal_values (_tmp4_, _tmp5_); -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp6_) { -#line 897 "Alteration.c" - const gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; + if (alteration_equal_values (_tmp4_, subject)) { +#line 901 "Alteration.c" + const gchar* _tmp5_; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = self->priv->detail; + _tmp5_ = self->priv->detail; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = detail; -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = alteration_equal_values (_tmp7_, _tmp8_); -#line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = _tmp9_; -#line 909 "Alteration.c" + _tmp3_ = alteration_equal_values (_tmp5_, detail); +#line 907 "Alteration.c" } else { #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp3_ = FALSE; -#line 913 "Alteration.c" +#line 911 "Alteration.c" } #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = _tmp3_; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 919 "Alteration.c" +#line 917 "Alteration.c" } #line 141 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = self->priv->map; + _tmp6_ = self->priv->map; #line 141 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp10_ != NULL, "map != null"); -#line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->map; + _vala_assert (_tmp6_ != NULL, "map != null"); #line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = subject; + _tmp7_ = self->priv->map; #line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = gee_multi_map_get (_tmp11_, _tmp12_); + _tmp8_ = gee_multi_map_get (_tmp7_, subject); #line 142 "/home/jens/Source/shotwell/src/core/Alteration.vala" - values = _tmp13_; + values = _tmp8_; #line 143 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = values; + _tmp9_ = values; #line 143 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp14_ != NULL) { -#line 937 "Alteration.c" + if (_tmp9_ != NULL) { +#line 933 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp15_; - GeeIterator* _tmp16_; + GeeCollection* _tmp10_; + GeeIterator* _tmp11_; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = values; + _tmp10_ = values; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _value_it = _tmp16_; + _value_it = _tmp11_; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 950 "Alteration.c" - GeeIterator* _tmp17_; - gboolean _tmp18_; +#line 946 "Alteration.c" + GeeIterator* _tmp12_; gchar* value = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - const gchar* _tmp21_; - const gchar* _tmp22_; - gboolean _tmp23_; -#line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _value_it; + GeeIterator* _tmp13_; + gpointer _tmp14_; + const gchar* _tmp15_; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = gee_iterator_next (_tmp17_); + _tmp12_ = _value_it; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp12_)) { #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 967 "Alteration.c" +#line 958 "Alteration.c" } #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _value_it; + _tmp13_ = _value_it; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" - value = (gchar*) _tmp20_; -#line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = value; + value = (gchar*) _tmp14_; #line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = detail; + _tmp15_ = value; #line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = alteration_equal_values (_tmp21_, _tmp22_); -#line 145 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp23_) { + if (alteration_equal_values (_tmp15_, detail)) { #line 146 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 146 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -989,15 +976,15 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc _g_object_unref0 (values); #line 146 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 993 "Alteration.c" +#line 980 "Alteration.c" } #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (value); -#line 997 "Alteration.c" +#line 984 "Alteration.c" } #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_value_it); -#line 1001 "Alteration.c" +#line 988 "Alteration.c" } } #line 150 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1006,17 +993,20 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc _g_object_unref0 (values); #line 150 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1010 "Alteration.c" +#line 997 "Alteration.c" } -GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { +GeeCollection* +alteration_get_details (Alteration* self, + const gchar* subject) +{ GeeCollection* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; const gchar* _tmp2_; - GeeCollection* _tmp10_ = NULL; - GeeMultiMap* _tmp11_; + GeeCollection* _tmp8_ = NULL; + GeeMultiMap* _tmp9_; #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), NULL); #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1025,96 +1015,89 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { _tmp2_ = self->priv->subject; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp2_ != NULL) { -#line 1029 "Alteration.c" +#line 1019 "Alteration.c" const gchar* _tmp3_; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp3_ = self->priv->detail; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp1_ = _tmp3_ != NULL; -#line 1035 "Alteration.c" +#line 1025 "Alteration.c" } else { #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp1_ = FALSE; -#line 1039 "Alteration.c" +#line 1029 "Alteration.c" } #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp1_) { -#line 1043 "Alteration.c" +#line 1033 "Alteration.c" const gchar* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp4_ = self->priv->subject; #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = subject; -#line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = alteration_equal_values (_tmp4_, _tmp5_); -#line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = _tmp6_; -#line 1055 "Alteration.c" + _tmp0_ = alteration_equal_values (_tmp4_, subject); +#line 1039 "Alteration.c" } else { #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp0_ = FALSE; -#line 1059 "Alteration.c" +#line 1043 "Alteration.c" } #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_) { -#line 1063 "Alteration.c" +#line 1047 "Alteration.c" GeeArrayList* details = NULL; - GeeArrayList* _tmp7_; - GeeArrayList* _tmp8_; - const gchar* _tmp9_; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; + const gchar* _tmp7_; #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala" - details = _tmp7_; + details = _tmp5_; #line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = details; + _tmp6_ = details; #line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = self->priv->detail; + _tmp7_ = self->priv->detail; #line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); #line 158 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = G_TYPE_CHECK_INSTANCE_CAST (details, GEE_TYPE_COLLECTION, GeeCollection); #line 158 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1082 "Alteration.c" +#line 1066 "Alteration.c" } #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->map; + _tmp9_ = self->priv->map; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp11_ != NULL) { -#line 1088 "Alteration.c" - GeeMultiMap* _tmp12_; - const gchar* _tmp13_; - GeeCollection* _tmp14_; -#line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = self->priv->map; + if (_tmp9_ != NULL) { +#line 1072 "Alteration.c" + GeeMultiMap* _tmp10_; + GeeCollection* _tmp11_; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = subject; + _tmp10_ = self->priv->map; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = gee_multi_map_get (_tmp12_, _tmp13_); + _tmp11_ = gee_multi_map_get (_tmp10_, subject); #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp14_; -#line 1102 "Alteration.c" + _tmp8_ = _tmp11_; +#line 1083 "Alteration.c" } else { #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = NULL; -#line 1108 "Alteration.c" + _tmp8_ = NULL; +#line 1089 "Alteration.c" } #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp10_; + result = _tmp8_; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1114 "Alteration.c" +#line 1095 "Alteration.c" } -gchar* alteration_to_string (Alteration* self) { +gchar* +alteration_to_string (Alteration* self) +{ gchar* result = NULL; const gchar* _tmp0_; GeeMultiMap* _tmp5_; @@ -1126,7 +1109,7 @@ gchar* alteration_to_string (Alteration* self) { _tmp0_ = self->priv->subject; #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_ != NULL) { -#line 1130 "Alteration.c" +#line 1113 "Alteration.c" const gchar* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; @@ -1145,7 +1128,7 @@ gchar* alteration_to_string (Alteration* self) { result = _tmp4_; #line 168 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1149 "Alteration.c" +#line 1132 "Alteration.c" } #line 171 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp5_ = self->priv->map; @@ -1155,7 +1138,7 @@ gchar* alteration_to_string (Alteration* self) { _tmp6_ = g_strdup (""); #line 173 "/home/jens/Source/shotwell/src/core/Alteration.vala" str = _tmp6_; -#line 1159 "Alteration.c" +#line 1142 "Alteration.c" { GeeIterator* _key_it = NULL; GeeMultiMap* _tmp7_; @@ -1179,456 +1162,411 @@ gchar* alteration_to_string (Alteration* self) { _key_it = _tmp11_; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1183 "Alteration.c" +#line 1166 "Alteration.c" GeeIterator* _tmp12_; - gboolean _tmp13_; gchar* key = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp13_; + gpointer _tmp14_; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp12_ = _key_it; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp12_)) { #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1197 "Alteration.c" +#line 1177 "Alteration.c" } #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = _key_it; + _tmp13_ = _key_it; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp15_; -#line 1205 "Alteration.c" + key = (gchar*) _tmp14_; +#line 1185 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeMultiMap* _tmp16_; - const gchar* _tmp17_; + GeeMultiMap* _tmp15_; + const gchar* _tmp16_; + GeeCollection* _tmp17_; GeeCollection* _tmp18_; - GeeCollection* _tmp19_; + GeeIterator* _tmp19_; GeeIterator* _tmp20_; - GeeIterator* _tmp21_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = self->priv->map; + _tmp15_ = self->priv->map; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = key; + _tmp16_ = key; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = gee_multi_map_get (_tmp16_, _tmp17_); + _tmp17_ = gee_multi_map_get (_tmp15_, _tmp16_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp19_); + _g_object_unref0 (_tmp18_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _value_it = _tmp21_; + _value_it = _tmp20_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1232 "Alteration.c" - GeeIterator* _tmp22_; - gboolean _tmp23_; +#line 1212 "Alteration.c" + GeeIterator* _tmp21_; gchar* value = NULL; - GeeIterator* _tmp24_; - gpointer _tmp25_; - const gchar* _tmp26_; - gint _tmp27_; - gint _tmp28_; + GeeIterator* _tmp22_; + gpointer _tmp23_; + const gchar* _tmp24_; + gint _tmp25_; + gint _tmp26_; + const gchar* _tmp29_; + const gchar* _tmp30_; const gchar* _tmp31_; - const gchar* _tmp32_; - const gchar* _tmp33_; + gchar* _tmp32_; + gchar* _tmp33_; gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = _value_it; -#line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = gee_iterator_next (_tmp22_); + _tmp21_ = _value_it; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp23_) { + if (!gee_iterator_next (_tmp21_)) { #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1255 "Alteration.c" +#line 1232 "Alteration.c" } #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = _value_it; + _tmp22_ = _value_it; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = gee_iterator_get (_tmp24_); + _tmp23_ = gee_iterator_get (_tmp22_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" - value = (gchar*) _tmp25_; + value = (gchar*) _tmp23_; #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = str; + _tmp24_ = str; #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = strlen (_tmp26_); + _tmp25_ = strlen (_tmp24_); #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp28_ != 0) { -#line 1271 "Alteration.c" - const gchar* _tmp29_; - gchar* _tmp30_; + if (_tmp26_ != 0) { +#line 1248 "Alteration.c" + const gchar* _tmp27_; + gchar* _tmp28_; #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = str; + _tmp27_ = str; #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp30_ = g_strconcat (_tmp29_, ", ", NULL); + _tmp28_ = g_strconcat (_tmp27_, ", ", NULL); #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (str); #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" - str = _tmp30_; -#line 1282 "Alteration.c" + str = _tmp28_; +#line 1259 "Alteration.c" } #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp31_ = str; + _tmp29_ = str; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp32_ = key; + _tmp30_ = key; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp33_ = value; + _tmp31_ = value; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = g_strdup_printf ("%s:%s", _tmp32_, _tmp33_); + _tmp32_ = g_strdup_printf ("%s:%s", _tmp30_, _tmp31_); #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp35_ = _tmp34_; + _tmp33_ = _tmp32_; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp36_ = g_strconcat (_tmp31_, _tmp35_, NULL); + _tmp34_ = g_strconcat (_tmp29_, _tmp33_, NULL); #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (str); #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - str = _tmp36_; + str = _tmp34_; #line 179 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp33_); #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (value); -#line 1304 "Alteration.c" +#line 1281 "Alteration.c" } #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_value_it); -#line 1308 "Alteration.c" +#line 1285 "Alteration.c" } #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 1312 "Alteration.c" +#line 1289 "Alteration.c" } #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 1316 "Alteration.c" +#line 1293 "Alteration.c" } #line 183 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = str; #line 183 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1322 "Alteration.c" +#line 1299 "Alteration.c" } -gboolean alteration_contains_any (Alteration* self, Alteration* other) { +gboolean +alteration_contains_any (Alteration* self, + Alteration* other) +{ gboolean result = FALSE; - Alteration* _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - GeeMultiMap* _tmp21_; - gboolean _tmp56_ = FALSE; - GeeMultiMap* _tmp57_; + const gchar* _tmp3_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_ = FALSE; + GeeMultiMap* _tmp14_; + gboolean _tmp42_ = FALSE; + GeeMultiMap* _tmp43_; #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (other), FALSE); #line 189 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = other; -#line 189 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (self == _tmp0_) { + if (self == other) { #line 190 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 190 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1350 "Alteration.c" +#line 1327 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = self->priv->subject; -#line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp4_ != NULL) { -#line 1356 "Alteration.c" - Alteration* _tmp5_; - const gchar* _tmp6_; + _tmp3_ = self->priv->subject; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = other; + if (_tmp3_ != NULL) { +#line 1333 "Alteration.c" + const gchar* _tmp4_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = _tmp5_->priv->subject; + _tmp4_ = other->priv->subject; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = _tmp6_ != NULL; -#line 1365 "Alteration.c" + _tmp2_ = _tmp4_ != NULL; +#line 1339 "Alteration.c" } else { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = FALSE; -#line 1369 "Alteration.c" + _tmp2_ = FALSE; +#line 1343 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp3_) { -#line 1373 "Alteration.c" - const gchar* _tmp7_; + if (_tmp2_) { +#line 1347 "Alteration.c" + const gchar* _tmp5_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = self->priv->detail; + _tmp5_ = self->priv->detail; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp7_ != NULL; -#line 1379 "Alteration.c" + _tmp1_ = _tmp5_ != NULL; +#line 1353 "Alteration.c" } else { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = FALSE; -#line 1383 "Alteration.c" + _tmp1_ = FALSE; +#line 1357 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp2_) { -#line 1387 "Alteration.c" - Alteration* _tmp8_; - const gchar* _tmp9_; -#line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = other; + if (_tmp1_) { +#line 1361 "Alteration.c" + const gchar* _tmp6_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = _tmp8_->priv->detail; + _tmp6_ = other->priv->detail; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = _tmp9_ != NULL; -#line 1396 "Alteration.c" + _tmp0_ = _tmp6_ != NULL; +#line 1367 "Alteration.c" } else { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = FALSE; -#line 1400 "Alteration.c" + _tmp0_ = FALSE; +#line 1371 "Alteration.c" } #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp1_) { -#line 1404 "Alteration.c" - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_; - Alteration* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->subject; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = other; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _tmp12_->priv->subject; -#line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = alteration_equal_values (_tmp11_, _tmp13_); + if (_tmp0_) { +#line 1375 "Alteration.c" + gboolean _tmp7_ = FALSE; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp14_) { -#line 1420 "Alteration.c" - const gchar* _tmp15_; - Alteration* _tmp16_; - const gchar* _tmp17_; - gboolean _tmp18_; + _tmp8_ = self->priv->subject; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = self->priv->detail; + _tmp9_ = other->priv->subject; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = other; + if (alteration_equal_values (_tmp8_, _tmp9_)) { +#line 1385 "Alteration.c" + const gchar* _tmp10_; + const gchar* _tmp11_; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _tmp16_->priv->detail; + _tmp10_ = self->priv->detail; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = alteration_equal_values (_tmp15_, _tmp17_); + _tmp11_ = other->priv->detail; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp18_; -#line 1435 "Alteration.c" + _tmp7_ = alteration_equal_values (_tmp10_, _tmp11_); +#line 1394 "Alteration.c" } else { #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = FALSE; -#line 1439 "Alteration.c" + _tmp7_ = FALSE; +#line 1398 "Alteration.c" } #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp10_; + result = _tmp7_; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1445 "Alteration.c" +#line 1404 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = self->priv->map; + _tmp14_ = self->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp21_ != NULL) { -#line 1451 "Alteration.c" - Alteration* _tmp22_; - GeeMultiMap* _tmp23_; -#line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = other; + if (_tmp14_ != NULL) { +#line 1410 "Alteration.c" + GeeMultiMap* _tmp15_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = _tmp22_->priv->map; + _tmp15_ = other->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = _tmp23_ == NULL; -#line 1460 "Alteration.c" + _tmp13_ = _tmp15_ == NULL; +#line 1416 "Alteration.c" } else { #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = FALSE; -#line 1464 "Alteration.c" + _tmp13_ = FALSE; +#line 1420 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp20_) { + if (_tmp13_) { #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = TRUE; -#line 1470 "Alteration.c" + _tmp12_ = TRUE; +#line 1426 "Alteration.c" } else { - gboolean _tmp24_ = FALSE; - GeeMultiMap* _tmp25_; + gboolean _tmp16_ = FALSE; + GeeMultiMap* _tmp17_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = self->priv->map; -#line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp25_ == NULL) { -#line 1478 "Alteration.c" - Alteration* _tmp26_; - GeeMultiMap* _tmp27_; + _tmp17_ = self->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = other; + if (_tmp17_ == NULL) { +#line 1434 "Alteration.c" + GeeMultiMap* _tmp18_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = _tmp26_->priv->map; + _tmp18_ = other->priv->map; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = _tmp27_ != NULL; -#line 1487 "Alteration.c" + _tmp16_ = _tmp18_ != NULL; +#line 1440 "Alteration.c" } else { #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = FALSE; -#line 1491 "Alteration.c" + _tmp16_ = FALSE; +#line 1444 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _tmp24_; -#line 1495 "Alteration.c" + _tmp12_ = _tmp16_; +#line 1448 "Alteration.c" } #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp19_) { -#line 1499 "Alteration.c" - const gchar* _tmp28_ = NULL; - const gchar* _tmp29_; + if (_tmp12_) { +#line 1452 "Alteration.c" + const gchar* _tmp19_ = NULL; + const gchar* _tmp20_; gchar* single_subject = NULL; - gchar* _tmp33_; - const gchar* _tmp34_ = NULL; - const gchar* _tmp35_; + gchar* _tmp23_; + const gchar* _tmp24_ = NULL; + const gchar* _tmp25_; gchar* single_detail = NULL; - gchar* _tmp39_; - GeeMultiMap* _tmp40_ = NULL; - GeeMultiMap* _tmp41_; + gchar* _tmp28_; + GeeMultiMap* _tmp29_ = NULL; + GeeMultiMap* _tmp30_; GeeMultiMap* multimap = NULL; - GeeMultiMap* _tmp45_; - gboolean _tmp46_ = FALSE; - GeeMultiMap* _tmp47_; - const gchar* _tmp48_; - gboolean _tmp49_; + GeeMultiMap* _tmp33_; + gboolean _tmp34_ = FALSE; + GeeMultiMap* _tmp35_; + const gchar* _tmp36_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = self->priv->subject; + _tmp20_ = self->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp29_ != NULL) { -#line 1520 "Alteration.c" - const gchar* _tmp30_; + if (_tmp20_ != NULL) { +#line 1472 "Alteration.c" + const gchar* _tmp21_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp30_ = self->priv->subject; + _tmp21_ = self->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = _tmp30_; -#line 1526 "Alteration.c" + _tmp19_ = _tmp21_; +#line 1478 "Alteration.c" } else { - Alteration* _tmp31_; - const gchar* _tmp32_; -#line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp31_ = other; + const gchar* _tmp22_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp32_ = _tmp31_->priv->subject; + _tmp22_ = other->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = _tmp32_; -#line 1536 "Alteration.c" + _tmp19_ = _tmp22_; +#line 1485 "Alteration.c" } #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp33_ = g_strdup (_tmp28_); + _tmp23_ = g_strdup (_tmp19_); #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" - single_subject = _tmp33_; + single_subject = _tmp23_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp35_ = self->priv->detail; + _tmp25_ = self->priv->detail; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp35_ != NULL) { -#line 1546 "Alteration.c" - const gchar* _tmp36_; + if (_tmp25_ != NULL) { +#line 1495 "Alteration.c" + const gchar* _tmp26_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp36_ = self->priv->detail; + _tmp26_ = self->priv->detail; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = _tmp36_; -#line 1552 "Alteration.c" + _tmp24_ = _tmp26_; +#line 1501 "Alteration.c" } else { - Alteration* _tmp37_; - const gchar* _tmp38_; -#line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp37_ = other; + const gchar* _tmp27_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp38_ = _tmp37_->priv->detail; + _tmp27_ = other->priv->detail; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = _tmp38_; -#line 1562 "Alteration.c" + _tmp24_ = _tmp27_; +#line 1508 "Alteration.c" } #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp39_ = g_strdup (_tmp34_); + _tmp28_ = g_strdup (_tmp24_); #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" - single_detail = _tmp39_; + single_detail = _tmp28_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp41_ = self->priv->map; + _tmp30_ = self->priv->map; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp41_ != NULL) { -#line 1572 "Alteration.c" - GeeMultiMap* _tmp42_; + if (_tmp30_ != NULL) { +#line 1518 "Alteration.c" + GeeMultiMap* _tmp31_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp42_ = self->priv->map; + _tmp31_ = self->priv->map; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp40_ = _tmp42_; -#line 1578 "Alteration.c" + _tmp29_ = _tmp31_; +#line 1524 "Alteration.c" } else { - Alteration* _tmp43_; - GeeMultiMap* _tmp44_; + GeeMultiMap* _tmp32_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp43_ = other; + _tmp32_ = other->priv->map; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp44_ = _tmp43_->priv->map; -#line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp40_ = _tmp44_; -#line 1588 "Alteration.c" + _tmp29_ = _tmp32_; +#line 1531 "Alteration.c" } #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp45_ = _g_object_ref0 (_tmp40_); + _tmp33_ = _g_object_ref0 (_tmp29_); #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" - multimap = _tmp45_; -#line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp47_ = multimap; + multimap = _tmp33_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp48_ = single_subject; + _tmp35_ = multimap; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp49_ = gee_multi_map_contains (_tmp47_, _tmp48_); + _tmp36_ = single_subject; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp49_) { -#line 1602 "Alteration.c" - GeeMultiMap* _tmp50_; - const gchar* _tmp51_; - GeeCollection* _tmp52_; - GeeCollection* _tmp53_; - const gchar* _tmp54_; - gboolean _tmp55_; -#line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp50_ = self->priv->map; + if (gee_multi_map_contains (_tmp35_, _tmp36_)) { +#line 1543 "Alteration.c" + GeeMultiMap* _tmp37_; + const gchar* _tmp38_; + GeeCollection* _tmp39_; + GeeCollection* _tmp40_; + const gchar* _tmp41_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp51_ = single_subject; + _tmp37_ = self->priv->map; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp52_ = gee_multi_map_get (_tmp50_, _tmp51_); + _tmp38_ = single_subject; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp53_ = _tmp52_; + _tmp39_ = gee_multi_map_get (_tmp37_, _tmp38_); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp54_ = single_detail; + _tmp40_ = _tmp39_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp55_ = gee_collection_contains (_tmp53_, _tmp54_); + _tmp41_ = single_detail; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp46_ = _tmp55_; + _tmp34_ = gee_collection_contains (_tmp40_, _tmp41_); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _g_object_unref0 (_tmp53_); -#line 1625 "Alteration.c" + _g_object_unref0 (_tmp40_); +#line 1563 "Alteration.c" } else { #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp46_ = FALSE; -#line 1629 "Alteration.c" + _tmp34_ = FALSE; +#line 1567 "Alteration.c" } #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp46_; + result = _tmp34_; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (multimap); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1637,206 +1575,185 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { _g_free0 (single_subject); #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1641 "Alteration.c" +#line 1579 "Alteration.c" } #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp57_ = self->priv->map; + _tmp43_ = self->priv->map; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp57_ != NULL) { -#line 1647 "Alteration.c" - Alteration* _tmp58_; - GeeMultiMap* _tmp59_; + if (_tmp43_ != NULL) { +#line 1585 "Alteration.c" + GeeMultiMap* _tmp44_; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp58_ = other; + _tmp44_ = other->priv->map; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp59_ = _tmp58_->priv->map; -#line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp56_ = _tmp59_ != NULL; -#line 1656 "Alteration.c" + _tmp42_ = _tmp44_ != NULL; +#line 1591 "Alteration.c" } else { #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp56_ = FALSE; -#line 1660 "Alteration.c" + _tmp42_ = FALSE; +#line 1595 "Alteration.c" } #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp56_) { -#line 1664 "Alteration.c" + if (_tmp42_) { +#line 1599 "Alteration.c" GeeSet* keys = NULL; - GeeMultiMap* _tmp60_; - GeeSet* _tmp61_; - GeeSet* _tmp62_; + GeeMultiMap* _tmp45_; + GeeSet* _tmp46_; + GeeSet* _tmp47_; GeeSet* other_keys = NULL; - Alteration* _tmp63_; - GeeMultiMap* _tmp64_; - GeeSet* _tmp65_; - GeeSet* _tmp66_; + GeeMultiMap* _tmp48_; + GeeSet* _tmp49_; + GeeSet* _tmp50_; #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp60_ = self->priv->map; + _tmp45_ = self->priv->map; #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp61_ = gee_multi_map_get_keys (_tmp60_); + _tmp46_ = gee_multi_map_get_keys (_tmp45_); #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp61_; + keys = _tmp46_; #line 208 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp62_ = keys; + _tmp47_ = keys; #line 208 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp62_ != NULL, "keys != null"); -#line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp63_ = other; + _vala_assert (_tmp47_ != NULL, "keys != null"); #line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp64_ = _tmp63_->priv->map; + _tmp48_ = other->priv->map; #line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp65_ = gee_multi_map_get_keys (_tmp64_); + _tmp49_ = gee_multi_map_get_keys (_tmp48_); #line 209 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_keys = _tmp65_; + other_keys = _tmp49_; #line 210 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp66_ = other_keys; + _tmp50_ = other_keys; #line 210 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp66_ != NULL, "other_keys != null"); -#line 1696 "Alteration.c" + _vala_assert (_tmp50_ != NULL, "other_keys != null"); +#line 1628 "Alteration.c" { GeeIterator* _subject_it = NULL; - GeeSet* _tmp67_; - GeeIterator* _tmp68_; + GeeSet* _tmp51_; + GeeIterator* _tmp52_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp67_ = other_keys; + _tmp51_ = other_keys; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp68_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp52_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ITERABLE, GeeIterable)); #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _subject_it = _tmp68_; + _subject_it = _tmp52_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1709 "Alteration.c" - GeeIterator* _tmp69_; - gboolean _tmp70_; +#line 1641 "Alteration.c" + GeeIterator* _tmp53_; gchar* subject = NULL; - GeeIterator* _tmp71_; - gpointer _tmp72_; - GeeSet* _tmp73_; - const gchar* _tmp74_; - gboolean _tmp75_; + GeeIterator* _tmp54_; + gpointer _tmp55_; + GeeSet* _tmp56_; + const gchar* _tmp57_; GeeCollection* details = NULL; - GeeMultiMap* _tmp76_; - const gchar* _tmp77_; - GeeCollection* _tmp78_; + GeeMultiMap* _tmp58_; + const gchar* _tmp59_; + GeeCollection* _tmp60_; GeeCollection* other_details = NULL; - Alteration* _tmp79_; - GeeMultiMap* _tmp80_; - const gchar* _tmp81_; - GeeCollection* _tmp82_; - gboolean _tmp83_ = FALSE; - GeeCollection* _tmp84_; -#line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp69_ = _subject_it; + GeeMultiMap* _tmp61_; + const gchar* _tmp62_; + GeeCollection* _tmp63_; + gboolean _tmp64_ = FALSE; + GeeCollection* _tmp65_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp70_ = gee_iterator_next (_tmp69_); + _tmp53_ = _subject_it; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp70_) { + if (!gee_iterator_next (_tmp53_)) { #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1737 "Alteration.c" +#line 1664 "Alteration.c" } #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp71_ = _subject_it; + _tmp54_ = _subject_it; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp72_ = gee_iterator_get (_tmp71_); + _tmp55_ = gee_iterator_get (_tmp54_); #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" - subject = (gchar*) _tmp72_; -#line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp73_ = keys; + subject = (gchar*) _tmp55_; #line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp74_ = subject; + _tmp56_ = keys; #line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp75_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp74_); + _tmp57_ = subject; #line 213 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp75_) { + if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_)) { #line 214 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); #line 214 "/home/jens/Source/shotwell/src/core/Alteration.vala" continue; -#line 1757 "Alteration.c" +#line 1682 "Alteration.c" } #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp76_ = self->priv->map; + _tmp58_ = self->priv->map; #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp77_ = subject; + _tmp59_ = subject; #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp78_ = gee_multi_map_get (_tmp76_, _tmp77_); + _tmp60_ = gee_multi_map_get (_tmp58_, _tmp59_); #line 216 "/home/jens/Source/shotwell/src/core/Alteration.vala" - details = _tmp78_; -#line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp79_ = other; + details = _tmp60_; #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp80_ = _tmp79_->priv->map; + _tmp61_ = other->priv->map; #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp81_ = subject; + _tmp62_ = subject; #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp82_ = gee_multi_map_get (_tmp80_, _tmp81_); + _tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_); #line 217 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_details = _tmp82_; + other_details = _tmp63_; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp84_ = details; + _tmp65_ = details; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp84_ != NULL) { -#line 1781 "Alteration.c" - GeeCollection* _tmp85_; + if (_tmp65_ != NULL) { +#line 1704 "Alteration.c" + GeeCollection* _tmp66_; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp85_ = other_details; + _tmp66_ = other_details; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp83_ = _tmp85_ != NULL; -#line 1787 "Alteration.c" + _tmp64_ = _tmp66_ != NULL; +#line 1710 "Alteration.c" } else { #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp83_ = FALSE; -#line 1791 "Alteration.c" + _tmp64_ = FALSE; +#line 1714 "Alteration.c" } #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp83_) { -#line 1795 "Alteration.c" + if (_tmp64_) { +#line 1718 "Alteration.c" { GeeIterator* _detail_it = NULL; - GeeCollection* _tmp86_; - GeeIterator* _tmp87_; + GeeCollection* _tmp67_; + GeeIterator* _tmp68_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp86_ = other_details; + _tmp67_ = other_details; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp87_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp68_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ITERABLE, GeeIterable)); #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _detail_it = _tmp87_; + _detail_it = _tmp68_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 1808 "Alteration.c" - GeeIterator* _tmp88_; - gboolean _tmp89_; +#line 1731 "Alteration.c" + GeeIterator* _tmp69_; gchar* detail = NULL; - GeeIterator* _tmp90_; - gpointer _tmp91_; - GeeCollection* _tmp92_; - const gchar* _tmp93_; - gboolean _tmp94_; -#line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp88_ = _detail_it; + GeeIterator* _tmp70_; + gpointer _tmp71_; + GeeCollection* _tmp72_; + const gchar* _tmp73_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp89_ = gee_iterator_next (_tmp88_); + _tmp69_ = _detail_it; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp89_) { + if (!gee_iterator_next (_tmp69_)) { #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 1825 "Alteration.c" +#line 1744 "Alteration.c" } #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp90_ = _detail_it; + _tmp70_ = _detail_it; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp91_ = gee_iterator_get (_tmp90_); + _tmp71_ = gee_iterator_get (_tmp70_); #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" - detail = (gchar*) _tmp91_; + detail = (gchar*) _tmp71_; #line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp92_ = details; + _tmp72_ = details; #line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp93_ = detail; + _tmp73_ = detail; #line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp94_ = gee_collection_contains (_tmp92_, _tmp93_); -#line 221 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp94_) { + if (gee_collection_contains (_tmp72_, _tmp73_)) { #line 222 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 222 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1857,15 +1774,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 222 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1861 "Alteration.c" +#line 1778 "Alteration.c" } #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (detail); -#line 1865 "Alteration.c" +#line 1782 "Alteration.c" } #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_detail_it); -#line 1869 "Alteration.c" +#line 1786 "Alteration.c" } } #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1874,223 +1791,197 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { _g_object_unref0 (details); #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (subject); -#line 1878 "Alteration.c" +#line 1795 "Alteration.c" } #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_subject_it); -#line 1882 "Alteration.c" +#line 1799 "Alteration.c" } #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (other_keys); #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (keys); -#line 1888 "Alteration.c" +#line 1805 "Alteration.c" } #line 228 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 228 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1894 "Alteration.c" +#line 1811 "Alteration.c" } -gboolean alteration_equals (Alteration* self, Alteration* other) { +gboolean +alteration_equals (Alteration* self, + Alteration* other) +{ gboolean result = FALSE; - Alteration* _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; - gboolean _tmp19_ = FALSE; - GeeMultiMap* _tmp20_; + const gchar* _tmp3_; + gboolean _tmp12_ = FALSE; + GeeMultiMap* _tmp13_; #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), FALSE); #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (other), FALSE); #line 233 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = other; -#line 233 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (self == _tmp0_) { + if (self == other) { #line 234 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; #line 234 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 1919 "Alteration.c" +#line 1836 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = self->priv->subject; -#line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp4_ != NULL) { -#line 1925 "Alteration.c" - Alteration* _tmp5_; - const gchar* _tmp6_; + _tmp3_ = self->priv->subject; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = other; + if (_tmp3_ != NULL) { +#line 1842 "Alteration.c" + const gchar* _tmp4_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = _tmp5_->priv->subject; + _tmp4_ = other->priv->subject; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = _tmp6_ != NULL; -#line 1934 "Alteration.c" + _tmp2_ = _tmp4_ != NULL; +#line 1848 "Alteration.c" } else { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = FALSE; -#line 1938 "Alteration.c" + _tmp2_ = FALSE; +#line 1852 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp3_) { -#line 1942 "Alteration.c" - const gchar* _tmp7_; + if (_tmp2_) { +#line 1856 "Alteration.c" + const gchar* _tmp5_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = self->priv->detail; + _tmp5_ = self->priv->detail; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _tmp7_ != NULL; -#line 1948 "Alteration.c" + _tmp1_ = _tmp5_ != NULL; +#line 1862 "Alteration.c" } else { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = FALSE; -#line 1952 "Alteration.c" + _tmp1_ = FALSE; +#line 1866 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp2_) { -#line 1956 "Alteration.c" - Alteration* _tmp8_; - const gchar* _tmp9_; -#line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = other; + if (_tmp1_) { +#line 1870 "Alteration.c" + const gchar* _tmp6_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = _tmp8_->priv->detail; + _tmp6_ = other->priv->detail; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = _tmp9_ != NULL; -#line 1965 "Alteration.c" + _tmp0_ = _tmp6_ != NULL; +#line 1876 "Alteration.c" } else { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = FALSE; -#line 1969 "Alteration.c" + _tmp0_ = FALSE; +#line 1880 "Alteration.c" } #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp1_) { -#line 1973 "Alteration.c" - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_; - Alteration* _tmp12_; - const gchar* _tmp13_; - gboolean _tmp14_; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = self->priv->subject; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = other; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _tmp12_->priv->subject; -#line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = alteration_equal_values (_tmp11_, _tmp13_); + if (_tmp0_) { +#line 1884 "Alteration.c" + gboolean _tmp7_ = FALSE; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp14_) { -#line 1989 "Alteration.c" - const gchar* _tmp15_; - Alteration* _tmp16_; - const gchar* _tmp17_; - gboolean _tmp18_; + _tmp8_ = self->priv->subject; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = self->priv->detail; + _tmp9_ = other->priv->subject; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = other; + if (alteration_equal_values (_tmp8_, _tmp9_)) { +#line 1894 "Alteration.c" + const gchar* _tmp10_; + const gchar* _tmp11_; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _tmp16_->priv->detail; + _tmp10_ = self->priv->detail; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = alteration_equal_values (_tmp15_, _tmp17_); + _tmp11_ = other->priv->detail; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = _tmp18_; -#line 2004 "Alteration.c" + _tmp7_ = alteration_equal_values (_tmp10_, _tmp11_); +#line 1903 "Alteration.c" } else { #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = FALSE; -#line 2008 "Alteration.c" + _tmp7_ = FALSE; +#line 1907 "Alteration.c" } #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp10_; + result = _tmp7_; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2014 "Alteration.c" +#line 1913 "Alteration.c" } #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = self->priv->map; -#line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp20_ != NULL) { -#line 2020 "Alteration.c" - Alteration* _tmp21_; - GeeMultiMap* _tmp22_; + _tmp13_ = self->priv->map; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = other; + if (_tmp13_ != NULL) { +#line 1919 "Alteration.c" + GeeMultiMap* _tmp14_; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = _tmp21_->priv->map; + _tmp14_ = other->priv->map; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = _tmp22_ != NULL; -#line 2029 "Alteration.c" + _tmp12_ = _tmp14_ != NULL; +#line 1925 "Alteration.c" } else { #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = FALSE; -#line 2033 "Alteration.c" + _tmp12_ = FALSE; +#line 1929 "Alteration.c" } #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp19_) { -#line 2037 "Alteration.c" + if (_tmp12_) { +#line 1933 "Alteration.c" GeeSet* keys = NULL; - GeeMultiMap* _tmp23_; - GeeSet* _tmp24_; - GeeSet* _tmp25_; + GeeMultiMap* _tmp15_; + GeeSet* _tmp16_; + GeeSet* _tmp17_; GeeSet* other_keys = NULL; - Alteration* _tmp26_; - GeeMultiMap* _tmp27_; + GeeMultiMap* _tmp18_; + GeeSet* _tmp19_; + GeeSet* _tmp20_; + GeeSet* _tmp21_; + gint _tmp22_; + gint _tmp23_; + GeeSet* _tmp24_; + gint _tmp25_; + gint _tmp26_; + GeeSet* _tmp27_; GeeSet* _tmp28_; GeeSet* _tmp29_; GeeSet* _tmp30_; - gint _tmp31_; - gint _tmp32_; - GeeSet* _tmp33_; - gint _tmp34_; - gint _tmp35_; - GeeSet* _tmp36_; - GeeSet* _tmp37_; - gboolean _tmp38_; - GeeSet* _tmp39_; - GeeSet* _tmp40_; - gboolean _tmp41_; #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = self->priv->map; + _tmp15_ = self->priv->map; #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = gee_multi_map_get_keys (_tmp23_); + _tmp16_ = gee_multi_map_get_keys (_tmp15_); #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp24_; + keys = _tmp16_; #line 244 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = keys; + _tmp17_ = keys; #line 244 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp25_ != NULL, "keys != null"); + _vala_assert (_tmp17_ != NULL, "keys != null"); #line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = other; + _tmp18_ = other->priv->map; #line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = _tmp26_->priv->map; + _tmp19_ = gee_multi_map_get_keys (_tmp18_); #line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = gee_multi_map_get_keys (_tmp27_); -#line 245 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_keys = _tmp28_; + other_keys = _tmp19_; #line 246 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = other_keys; + _tmp20_ = other_keys; #line 246 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp29_ != NULL, "other_keys != null"); + _vala_assert (_tmp20_ != NULL, "other_keys != null"); #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp30_ = keys; + _tmp21_ = keys; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp31_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp32_ = _tmp31_; + _tmp23_ = _tmp22_; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp33_ = other_keys; + _tmp24_ = other_keys; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp35_ = _tmp34_; + _tmp26_ = _tmp25_; #line 248 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp32_ != _tmp35_) { + if (_tmp23_ != _tmp26_) { #line 249 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 249 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2099,16 +1990,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 249 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2103 "Alteration.c" +#line 1994 "Alteration.c" } #line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp36_ = keys; + _tmp27_ = keys; #line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp37_ = other_keys; + _tmp28_ = other_keys; #line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp38_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 251 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp38_) { + if (!gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection))) { #line 252 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 252 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2117,16 +2006,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 252 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2121 "Alteration.c" +#line 2010 "Alteration.c" } #line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp39_ = other_keys; -#line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp40_ = keys; + _tmp29_ = other_keys; #line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp41_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = keys; #line 254 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp41_) { + if (!gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection))) { #line 255 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 255 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2135,95 +2022,87 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 255 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2139 "Alteration.c" +#line 2026 "Alteration.c" } { GeeIterator* _key_it = NULL; - GeeSet* _tmp42_; - GeeIterator* _tmp43_; + GeeSet* _tmp31_; + GeeIterator* _tmp32_; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp42_ = keys; + _tmp31_ = keys; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _key_it = _tmp43_; + _key_it = _tmp32_; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 2153 "Alteration.c" - GeeIterator* _tmp44_; - gboolean _tmp45_; +#line 2040 "Alteration.c" + GeeIterator* _tmp33_; gchar* key = NULL; - GeeIterator* _tmp46_; - gpointer _tmp47_; + GeeIterator* _tmp34_; + gpointer _tmp35_; GeeCollection* values = NULL; - GeeMultiMap* _tmp48_; - const gchar* _tmp49_; - GeeCollection* _tmp50_; + GeeMultiMap* _tmp36_; + const gchar* _tmp37_; + GeeCollection* _tmp38_; GeeCollection* other_values = NULL; - Alteration* _tmp51_; - GeeMultiMap* _tmp52_; - const gchar* _tmp53_; - GeeCollection* _tmp54_; - GeeCollection* _tmp55_; - gint _tmp56_; - gint _tmp57_; - GeeCollection* _tmp58_; - gint _tmp59_; - gint _tmp60_; - GeeCollection* _tmp61_; - GeeCollection* _tmp62_; - gboolean _tmp63_; - GeeCollection* _tmp64_; - GeeCollection* _tmp65_; - gboolean _tmp66_; -#line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp44_ = _key_it; + GeeMultiMap* _tmp39_; + const gchar* _tmp40_; + GeeCollection* _tmp41_; + GeeCollection* _tmp42_; + gint _tmp43_; + gint _tmp44_; + GeeCollection* _tmp45_; + gint _tmp46_; + gint _tmp47_; + GeeCollection* _tmp48_; + GeeCollection* _tmp49_; + GeeCollection* _tmp50_; + GeeCollection* _tmp51_; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp45_ = gee_iterator_next (_tmp44_); + _tmp33_ = _key_it; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp45_) { + if (!gee_iterator_next (_tmp33_)) { #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 2188 "Alteration.c" +#line 2069 "Alteration.c" } #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp46_ = _key_it; + _tmp34_ = _key_it; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp47_ = gee_iterator_get (_tmp46_); + _tmp35_ = gee_iterator_get (_tmp34_); #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp47_; + key = (gchar*) _tmp35_; #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp48_ = self->priv->map; + _tmp36_ = self->priv->map; #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp49_ = key; + _tmp37_ = key; #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp50_ = gee_multi_map_get (_tmp48_, _tmp49_); + _tmp38_ = gee_multi_map_get (_tmp36_, _tmp37_); #line 258 "/home/jens/Source/shotwell/src/core/Alteration.vala" - values = _tmp50_; + values = _tmp38_; #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp51_ = other; + _tmp39_ = other->priv->map; #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp52_ = _tmp51_->priv->map; + _tmp40_ = key; #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp53_ = key; + _tmp41_ = gee_multi_map_get (_tmp39_, _tmp40_); #line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp54_ = gee_multi_map_get (_tmp52_, _tmp53_); -#line 259 "/home/jens/Source/shotwell/src/core/Alteration.vala" - other_values = _tmp54_; + other_values = _tmp41_; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp55_ = values; + _tmp42_ = values; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp56_ = gee_collection_get_size (_tmp55_); + _tmp43_ = gee_collection_get_size (_tmp42_); #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp57_ = _tmp56_; + _tmp44_ = _tmp43_; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp58_ = other_values; + _tmp45_ = other_values; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp59_ = gee_collection_get_size (_tmp58_); + _tmp46_ = gee_collection_get_size (_tmp45_); #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp60_ = _tmp59_; + _tmp47_ = _tmp46_; #line 261 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp57_ != _tmp60_) { + if (_tmp44_ != _tmp47_) { #line 262 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 262 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2240,16 +2119,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 262 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2244 "Alteration.c" +#line 2123 "Alteration.c" } #line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp61_ = values; + _tmp48_ = values; #line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp62_ = other_values; + _tmp49_ = other_values; #line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp63_ = gee_collection_contains_all (_tmp61_, _tmp62_); -#line 264 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp63_) { + if (!gee_collection_contains_all (_tmp48_, _tmp49_)) { #line 265 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 265 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2266,16 +2143,14 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 265 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2270 "Alteration.c" +#line 2147 "Alteration.c" } #line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp64_ = other_values; -#line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp65_ = values; + _tmp50_ = other_values; #line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp66_ = gee_collection_contains_all (_tmp64_, _tmp65_); + _tmp51_ = values; #line 267 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp66_) { + if (!gee_collection_contains_all (_tmp50_, _tmp51_)) { #line 268 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 268 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2292,7 +2167,7 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 268 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2296 "Alteration.c" +#line 2171 "Alteration.c" } #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (other_values); @@ -2300,11 +2175,11 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (values); #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 2304 "Alteration.c" +#line 2179 "Alteration.c" } #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 2308 "Alteration.c" +#line 2183 "Alteration.c" } #line 272 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = TRUE; @@ -2314,414 +2189,408 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { _g_object_unref0 (keys); #line 272 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2318 "Alteration.c" +#line 2193 "Alteration.c" } #line 276 "/home/jens/Source/shotwell/src/core/Alteration.vala" result = FALSE; #line 276 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2324 "Alteration.c" +#line 2199 "Alteration.c" } -static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) { +static void +alteration_multimap_add_all (GeeMultiMap* dest, + GeeMultiMap* src) +{ GeeSet* keys = NULL; - GeeMultiMap* _tmp0_; - GeeSet* _tmp1_; + GeeSet* _tmp0_; #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (GEE_IS_MULTI_MAP (dest)); #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (GEE_IS_MULTI_MAP (src)); #line 281 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = src; + _tmp0_ = gee_multi_map_get_keys (src); #line 281 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = gee_multi_map_get_keys (_tmp0_); -#line 281 "/home/jens/Source/shotwell/src/core/Alteration.vala" - keys = _tmp1_; -#line 2342 "Alteration.c" + keys = _tmp0_; +#line 2217 "Alteration.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp2_; - GeeIterator* _tmp3_; + GeeSet* _tmp1_; + GeeIterator* _tmp2_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = keys; + _tmp1_ = keys; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _key_it = _tmp3_; + _key_it = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 2355 "Alteration.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 2230 "Alteration.c" + GeeIterator* _tmp3_; gchar* key = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp4_; + gpointer _tmp5_; GeeCollection* values = NULL; - GeeMultiMap* _tmp8_; - const gchar* _tmp9_; - GeeCollection* _tmp10_; -#line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = _key_it; + const gchar* _tmp6_; + GeeCollection* _tmp7_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = gee_iterator_next (_tmp4_); + _tmp3_ = _key_it; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp3_)) { #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 2373 "Alteration.c" +#line 2244 "Alteration.c" } #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = _key_it; + _tmp4_ = _key_it; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" - key = (gchar*) _tmp7_; + key = (gchar*) _tmp5_; #line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = src; + _tmp6_ = key; #line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = key; + _tmp7_ = gee_multi_map_get (src, _tmp6_); #line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = gee_multi_map_get (_tmp8_, _tmp9_); -#line 283 "/home/jens/Source/shotwell/src/core/Alteration.vala" - values = _tmp10_; -#line 2389 "Alteration.c" + values = _tmp7_; +#line 2258 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp11_; - GeeIterator* _tmp12_; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = values; + _tmp8_ = values; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _value_it = _tmp12_; + _value_it = _tmp9_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { -#line 2402 "Alteration.c" - GeeIterator* _tmp13_; - gboolean _tmp14_; +#line 2271 "Alteration.c" + GeeIterator* _tmp10_; gchar* value = NULL; - GeeIterator* _tmp15_; - gpointer _tmp16_; - GeeMultiMap* _tmp17_; - const gchar* _tmp18_; - const gchar* _tmp19_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _value_it; + _tmp10_ = _value_it; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = gee_iterator_next (_tmp13_); -#line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp10_)) { #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" break; -#line 2419 "Alteration.c" +#line 2284 "Alteration.c" } #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = _value_it; + _tmp11_ = _value_it; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" - value = (gchar*) _tmp16_; -#line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = dest; + value = (gchar*) _tmp12_; #line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = key; + _tmp13_ = key; #line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = value; + _tmp14_ = value; #line 285 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp17_, _tmp18_, _tmp19_); + gee_multi_map_set (dest, _tmp13_, _tmp14_); #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (value); -#line 2437 "Alteration.c" +#line 2300 "Alteration.c" } #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_value_it); -#line 2441 "Alteration.c" +#line 2304 "Alteration.c" } #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (values); #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_free0 (key); -#line 2447 "Alteration.c" +#line 2310 "Alteration.c" } #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (_key_it); -#line 2451 "Alteration.c" +#line 2314 "Alteration.c" } #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (keys); -#line 2455 "Alteration.c" +#line 2318 "Alteration.c" } -static gpointer _alteration_ref0 (gpointer self) { +static gpointer +_alteration_ref0 (gpointer self) +{ #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" return self ? alteration_ref (self) : NULL; -#line 2462 "Alteration.c" +#line 2327 "Alteration.c" } -Alteration* alteration_compress (Alteration* self, Alteration* other) { +Alteration* +alteration_compress (Alteration* self, + Alteration* other) +{ Alteration* result = NULL; - Alteration* _tmp0_; - gboolean _tmp1_; GeeMultiMap* compressed = NULL; - GeeMultiMap* _tmp3_; - gboolean _tmp4_ = FALSE; - const gchar* _tmp5_; - gboolean _tmp13_ = FALSE; - Alteration* _tmp14_; - const gchar* _tmp15_; - GeeMultiMap* _tmp28_; - Alteration* _tmp29_; + GeeMultiMap* _tmp1_; + gboolean _tmp2_ = FALSE; + const gchar* _tmp3_; + gboolean _tmp11_ = FALSE; + const gchar* _tmp12_; + GeeMultiMap* _tmp20_; + Alteration* _tmp21_; #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), NULL); #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (other), NULL); #line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp0_ = other; -#line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp1_ = alteration_equals (self, _tmp0_); -#line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp1_) { -#line 2489 "Alteration.c" - Alteration* _tmp2_; + if (alteration_equals (self, other)) { +#line 2350 "Alteration.c" + Alteration* _tmp0_; #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp2_ = _alteration_ref0 (self); + _tmp0_ = _alteration_ref0 (self); #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp2_; + result = _tmp0_; #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2497 "Alteration.c" +#line 2358 "Alteration.c" } #line 297 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp3_ = alteration_create_map (self); + _tmp1_ = alteration_create_map (self); #line 297 "/home/jens/Source/shotwell/src/core/Alteration.vala" - compressed = _tmp3_; + compressed = _tmp1_; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp5_ = self->priv->subject; + _tmp3_ = self->priv->subject; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp5_ != NULL) { -#line 2507 "Alteration.c" - const gchar* _tmp6_; + if (_tmp3_ != NULL) { +#line 2368 "Alteration.c" + const gchar* _tmp4_; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp6_ = self->priv->detail; + _tmp4_ = self->priv->detail; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = _tmp6_ != NULL; -#line 2513 "Alteration.c" + _tmp2_ = _tmp4_ != NULL; +#line 2374 "Alteration.c" } else { #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp4_ = FALSE; -#line 2517 "Alteration.c" + _tmp2_ = FALSE; +#line 2378 "Alteration.c" } #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp4_) { -#line 2521 "Alteration.c" - GeeMultiMap* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; + if (_tmp2_) { +#line 2382 "Alteration.c" + GeeMultiMap* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp7_ = compressed; + _tmp5_ = compressed; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp8_ = self->priv->subject; + _tmp6_ = self->priv->subject; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp9_ = self->priv->detail; + _tmp7_ = self->priv->detail; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp7_, _tmp8_, _tmp9_); -#line 2533 "Alteration.c" + gee_multi_map_set (_tmp5_, _tmp6_, _tmp7_); +#line 2394 "Alteration.c" } else { + GeeMultiMap* _tmp8_; + GeeMultiMap* _tmp9_; GeeMultiMap* _tmp10_; - GeeMultiMap* _tmp11_; - GeeMultiMap* _tmp12_; #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp10_ = self->priv->map; + _tmp8_ = self->priv->map; #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp10_ != NULL, "map != null"); + _vala_assert (_tmp8_ != NULL, "map != null"); #line 303 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp11_ = compressed; + _tmp9_ = compressed; #line 303 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp12_ = self->priv->map; + _tmp10_ = self->priv->map; #line 303 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_multimap_add_all (_tmp11_, _tmp12_); -#line 2548 "Alteration.c" + alteration_multimap_add_all (_tmp9_, _tmp10_); +#line 2409 "Alteration.c" } #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp14_ = other; + _tmp12_ = other->priv->subject; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp15_ = _tmp14_->priv->subject; -#line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp15_ != NULL) { -#line 2556 "Alteration.c" - Alteration* _tmp16_; - const gchar* _tmp17_; -#line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp16_ = other; + if (_tmp12_ != NULL) { +#line 2415 "Alteration.c" + const gchar* _tmp13_; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp17_ = _tmp16_->priv->detail; + _tmp13_ = other->priv->detail; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = _tmp17_ != NULL; -#line 2565 "Alteration.c" + _tmp11_ = _tmp13_ != NULL; +#line 2421 "Alteration.c" } else { #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp13_ = FALSE; -#line 2569 "Alteration.c" + _tmp11_ = FALSE; +#line 2425 "Alteration.c" } #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" - if (_tmp13_) { -#line 2573 "Alteration.c" - GeeMultiMap* _tmp18_; - Alteration* _tmp19_; - const gchar* _tmp20_; - Alteration* _tmp21_; - const gchar* _tmp22_; -#line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp18_ = compressed; -#line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp19_ = other; + if (_tmp11_) { +#line 2429 "Alteration.c" + GeeMultiMap* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp20_ = _tmp19_->priv->subject; + _tmp14_ = compressed; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp21_ = other; + _tmp15_ = other->priv->subject; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp22_ = _tmp21_->priv->detail; + _tmp16_ = other->priv->detail; #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala" - gee_multi_map_set (_tmp18_, _tmp20_, _tmp22_); -#line 2591 "Alteration.c" + gee_multi_map_set (_tmp14_, _tmp15_, _tmp16_); +#line 2441 "Alteration.c" } else { - Alteration* _tmp23_; - GeeMultiMap* _tmp24_; - GeeMultiMap* _tmp25_; - Alteration* _tmp26_; - GeeMultiMap* _tmp27_; -#line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp23_ = other; + GeeMultiMap* _tmp17_; + GeeMultiMap* _tmp18_; + GeeMultiMap* _tmp19_; #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp24_ = _tmp23_->priv->map; + _tmp17_ = other->priv->map; #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _vala_assert (_tmp24_ != NULL, "other.map != null"); -#line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp25_ = compressed; + _vala_assert (_tmp17_ != NULL, "other.map != null"); #line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp26_ = other; + _tmp18_ = compressed; #line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp27_ = _tmp26_->priv->map; + _tmp19_ = other->priv->map; #line 310 "/home/jens/Source/shotwell/src/core/Alteration.vala" - alteration_multimap_add_all (_tmp25_, _tmp27_); -#line 2612 "Alteration.c" + alteration_multimap_add_all (_tmp18_, _tmp19_); +#line 2456 "Alteration.c" } #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp28_ = compressed; + _tmp20_ = compressed; #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" - _tmp29_ = alteration_new_from_map (_tmp28_); + _tmp21_ = alteration_new_from_map (_tmp20_); #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" - result = _tmp29_; + result = _tmp21_; #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (compressed); #line 313 "/home/jens/Source/shotwell/src/core/Alteration.vala" return result; -#line 2624 "Alteration.c" +#line 2468 "Alteration.c" } -static void value_alteration_init (GValue* value) { +static void +value_alteration_init (GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2631 "Alteration.c" +#line 2477 "Alteration.c" } -static void value_alteration_free_value (GValue* value) { +static void +value_alteration_free_value (GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (value->data[0].v_pointer) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_unref (value->data[0].v_pointer); -#line 2640 "Alteration.c" +#line 2488 "Alteration.c" } } -static void value_alteration_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_alteration_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (src_value->data[0].v_pointer) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" dest_value->data[0].v_pointer = alteration_ref (src_value->data[0].v_pointer); -#line 2650 "Alteration.c" +#line 2501 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" dest_value->data[0].v_pointer = NULL; -#line 2654 "Alteration.c" +#line 2505 "Alteration.c" } } -static gpointer value_alteration_peek_pointer (const GValue* value) { +static gpointer +value_alteration_peek_pointer (const GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return value->data[0].v_pointer; -#line 2662 "Alteration.c" +#line 2515 "Alteration.c" } -static gchar* value_alteration_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_alteration_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (collect_values[0].v_pointer) { -#line 2669 "Alteration.c" +#line 2527 "Alteration.c" Alteration * object; object = collect_values[0].v_pointer; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (object->parent_instance.g_class == NULL) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2676 "Alteration.c" +#line 2534 "Alteration.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.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 2680 "Alteration.c" +#line 2538 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = alteration_ref (object); -#line 2684 "Alteration.c" +#line 2542 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2688 "Alteration.c" +#line 2546 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return NULL; -#line 2692 "Alteration.c" +#line 2550 "Alteration.c" } -static gchar* value_alteration_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_alteration_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ Alteration ** object_p; object_p = collect_values[0].v_pointer; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (!object_p) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2703 "Alteration.c" +#line 2566 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (!value->data[0].v_pointer) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" *object_p = NULL; -#line 2709 "Alteration.c" +#line 2572 "Alteration.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" *object_p = value->data[0].v_pointer; -#line 2713 "Alteration.c" +#line 2576 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" *object_p = alteration_ref (value->data[0].v_pointer); -#line 2717 "Alteration.c" +#line 2580 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return NULL; -#line 2721 "Alteration.c" +#line 2584 "Alteration.c" } -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAlteration* spec; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_ALTERATION), NULL); @@ -2731,20 +2600,25 @@ GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const g G_PARAM_SPEC (spec)->value_type = object_type; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return G_PARAM_SPEC (spec); -#line 2735 "Alteration.c" +#line 2604 "Alteration.c" } -gpointer value_get_alteration (const GValue* value) { +gpointer +value_get_alteration (const GValue* value) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION), NULL); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return value->data[0].v_pointer; -#line 2744 "Alteration.c" +#line 2615 "Alteration.c" } -void value_set_alteration (GValue* value, gpointer v_object) { +void +value_set_alteration (GValue* value, + gpointer v_object) +{ Alteration * old; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION)); @@ -2760,22 +2634,25 @@ void value_set_alteration (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_ref (value->data[0].v_pointer); -#line 2764 "Alteration.c" +#line 2638 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2768 "Alteration.c" +#line 2642 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (old) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_unref (old); -#line 2774 "Alteration.c" +#line 2648 "Alteration.c" } } -void value_take_alteration (GValue* value, gpointer v_object) { +void +value_take_alteration (GValue* value, + gpointer v_object) +{ Alteration * old; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION)); @@ -2789,33 +2666,37 @@ void value_take_alteration (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = v_object; -#line 2793 "Alteration.c" +#line 2670 "Alteration.c" } else { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" value->data[0].v_pointer = NULL; -#line 2797 "Alteration.c" +#line 2674 "Alteration.c" } #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (old) { #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_unref (old); -#line 2803 "Alteration.c" +#line 2680 "Alteration.c" } } -static void alteration_class_init (AlterationClass * klass) { +static void +alteration_class_init (AlterationClass * klass) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" alteration_parent_class = g_type_class_peek_parent (klass); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" ((AlterationClass *) klass)->finalize = alteration_finalize; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_type_class_add_private (klass, sizeof (AlterationPrivate)); -#line 2815 "Alteration.c" +#line 2694 "Alteration.c" } -static void alteration_instance_init (Alteration * self) { +static void +alteration_instance_init (Alteration * self) +{ #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" self->priv = ALTERATION_GET_PRIVATE (self); #line 28 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2826,11 +2707,13 @@ static void alteration_instance_init (Alteration * self) { self->priv->map = NULL; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" self->ref_count = 1; -#line 2830 "Alteration.c" +#line 2711 "Alteration.c" } -static void alteration_finalize (Alteration * obj) { +static void +alteration_finalize (Alteration * obj) +{ Alteration * self; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ALTERATION, Alteration); @@ -2842,11 +2725,13 @@ static void alteration_finalize (Alteration * obj) { _g_free0 (self->priv->detail); #line 30 "/home/jens/Source/shotwell/src/core/Alteration.vala" _g_object_unref0 (self->priv->map); -#line 2846 "Alteration.c" +#line 2729 "Alteration.c" } -GType alteration_get_type (void) { +GType +alteration_get_type (void) +{ static volatile gsize alteration_type_id__volatile = 0; if (g_once_init_enter (&alteration_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_alteration_init, value_alteration_free_value, value_alteration_copy_value, value_alteration_peek_pointer, "p", value_alteration_collect_value, "p", value_alteration_lcopy_value }; @@ -2860,18 +2745,22 @@ GType alteration_get_type (void) { } -gpointer alteration_ref (gpointer instance) { +gpointer +alteration_ref (gpointer instance) +{ Alteration * self; self = instance; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_atomic_int_inc (&self->ref_count); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" return instance; -#line 2871 "Alteration.c" +#line 2758 "Alteration.c" } -void alteration_unref (gpointer instance) { +void +alteration_unref (gpointer instance) +{ Alteration * self; self = instance; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2880,12 +2769,16 @@ void alteration_unref (gpointer instance) { ALTERATION_GET_CLASS (self)->finalize (self); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2884 "Alteration.c" +#line 2773 "Alteration.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2897,13 +2790,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c index 7bd5826..f9f30cb 100644 --- a/src/core/ContainerSourceCollection.c +++ b/src/core/ContainerSourceCollection.c @@ -1,4 +1,4 @@ -/* ContainerSourceCollection.c generated by valac 0.36.6, the Vala compiler +/* ContainerSourceCollection.c generated by valac 0.40.4, the Vala compiler * generated from ContainerSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ /* when they hold no items), they should use the evaporate() method, which will either destroy*/ /* the DataSource or hold it in the tank (if backlinks are outstanding).*/ + #include #include #include @@ -160,9 +161,9 @@ enum { CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL, CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL, CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL, - CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL + CONTAINER_SOURCE_COLLECTION_NUM_SIGNALS }; -static guint container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -300,17 +301,29 @@ static gpointer container_source_collection_parent_class = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -318,124 +331,226 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType container_source_get_type (void) G_GNUC_CONST; #define CONTAINER_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollectionPrivate)) -enum { - CONTAINER_SOURCE_COLLECTION_DUMMY_PROPERTY -}; void container_source_collection_detach_all_collections (ContainerSourceCollection* self); -ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, SourceBacklink* backlink, GeeCollection* sources); -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink); -void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources); -void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -void source_collection_relink (SourceCollection* self, DataSource* source); -void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources); -GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source); -static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source); -static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink); +ContainerSourceCollection* container_source_collection_construct (GType object_type, + const gchar* backlink_name, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, + SourceBacklink* backlink, + GeeCollection* sources); +void source_collection_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink); +void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources); +void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +void source_collection_relink (SourceCollection* self, + DataSource* source); +void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources); +GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source); +static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source); +static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink); void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self); void data_collection_freeze_notifications (DataCollection* self); void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self); void data_collection_thaw_notifications (DataCollection* self); GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self); -void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked); -void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked); -gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source); -static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking); -void data_source_set_backlink (DataSource* self, SourceBacklink* backlink); +void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, + ContainerSource* unlinked); +void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, + GeeCollection* unlinked); +gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, + ContainerSource* source); +static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, + GeeCollection* unlinking); +void data_source_set_backlink (DataSource* self, + SourceBacklink* backlink); SourceBacklink* container_source_get_backlink (ContainerSource* self); -void container_source_break_link_many (ContainerSource* self, GeeCollection* sources); -static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked); -GeeList* data_source_get_backlinks (DataSource* self, const gchar* name); +void container_source_break_link_many (ContainerSource* self, + GeeCollection* sources); +static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, + GeeCollection* relinked); +GeeList* data_source_get_backlinks (DataSource* self, + const gchar* name); gchar* data_object_to_string (DataObject* self); gchar* source_backlink_to_string (SourceBacklink* self); -void container_source_establish_link_many (ContainerSource* self, GeeCollection* sources); -static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, DataSource* source); +void container_source_establish_link_many (ContainerSource* self, + GeeCollection* sources); +static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, + DataSource* source); gboolean container_source_has_links (ContainerSource* self); GType tag_get_type (void) G_GNUC_CONST; -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); -static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source); -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source); -void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target); -Marker* data_collection_mark (DataCollection* self, DataObject* object); +gboolean data_source_destroy_orphan (DataSource* self, + gboolean delete_backing); +static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, + DataSource* source); +void source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); +void source_collection_notify_item_destroyed (SourceCollection* self, + DataSource* source); +void container_source_collection_evaporate (ContainerSourceCollection* self, + ContainerSource* container); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +GeeCollection* source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +void container_source_collection_attach_collection (ContainerSourceCollection* self, + SourceCollection* collection); gchar* data_collection_to_string (DataCollection* self); -static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self); -static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self); -static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); -static void container_source_collection_real_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -static void container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources); -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 _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, + GeeCollection* unlinking, + gpointer self); +static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, + GeeCollection* relinked, + gpointer self); +static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); +static void container_source_collection_real_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +static void container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); +static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources); +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 container_source_collection_finalize (DataCollection * obj); -ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) { +ContainerSourceCollection* +container_source_collection_construct (GType object_type, + const gchar* backlink_name, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target) +{ ContainerSourceCollection* self = NULL; - const gchar* _tmp0_; - GetSourceDatabaseKey _tmp1_; - void* _tmp1__target; - const gchar* _tmp2_; - gchar* _tmp3_; + gchar* _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (backlink_name != NULL, NULL); #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = name; -#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = source_key_func; -#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1__target = source_key_func_target; -#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - self = (ContainerSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target); + self = (ContainerSourceCollection*) database_source_collection_construct (object_type, name, source_key_func, source_key_func_target); #line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = backlink_name; -#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp0_ = g_strdup (backlink_name); #line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_free0 (self->priv->backlink_name); #line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - self->priv->backlink_name = _tmp3_; + self->priv->backlink_name = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return self; -#line 428 "ContainerSourceCollection.c" +#line 542 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, SourceBacklink* backlink, GeeCollection* sources) { +static void +container_source_collection_real_notify_backlink_removed (SourceCollection* base, + SourceBacklink* backlink, + GeeCollection* sources) +{ ContainerSourceCollection * self; - SourceBacklink* _tmp0_; - GeeCollection* _tmp1_; ContainerSource* container = NULL; - SourceBacklink* _tmp2_; - ContainerSource* _tmp3_; - ContainerSource* _tmp4_; + ContainerSource* _tmp0_; + ContainerSource* _tmp1_; #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -443,45 +558,36 @@ static void container_source_collection_real_notify_backlink_removed (SourceColl #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = backlink; -#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = sources; -#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_backlink_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_, _tmp1_); -#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = backlink; + SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_backlink_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), backlink, sources); #line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = container_source_collection_convert_backlink_to_container (self, _tmp2_); + _tmp0_ = container_source_collection_convert_backlink_to_container (self, backlink); #line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = _tmp3_; + container = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = container; + _tmp1_ = container; #line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp4_ != NULL) { -#line 462 "ContainerSourceCollection.c" - ContainerSource* _tmp5_; - GeeCollection* _tmp6_; -#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = container; + if (_tmp1_ != NULL) { +#line 571 "ContainerSourceCollection.c" + ContainerSource* _tmp2_; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = sources; + _tmp2_ = container; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container_source_collection_notify_backlink_to_container_removed (self, _tmp5_, _tmp6_); -#line 471 "ContainerSourceCollection.c" + container_source_collection_notify_backlink_to_container_removed (self, _tmp2_, sources); +#line 577 "ContainerSourceCollection.c" } #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 475 "ContainerSourceCollection.c" +#line 581 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { +static void +container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked) +{ GeeHashSet* _tmp0_; - ContainerSource* _tmp1_; - gboolean _tmp2_; - ContainerSource* _tmp8_; - GeeCollection* _tmp9_; - gboolean _tmp10_; #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -489,92 +595,81 @@ static void container_source_collection_real_notify_container_contents_added (Co #line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = container; -#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp2_) { -#line 498 "ContainerSourceCollection.c" + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), container)) { +#line 600 "ContainerSourceCollection.c" gboolean removed = FALSE; - GeeHashSet* _tmp3_; - ContainerSource* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - ContainerSource* _tmp7_; -#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = self->priv->holding_tank; -#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = container; + GeeHashSet* _tmp1_; + gboolean _tmp2_; #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); + _tmp1_ = self->priv->holding_tank; #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - removed = _tmp5_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), container); #line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = removed; + _tmp2_ = removed; #line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _vala_assert (_tmp6_, "removed"); + _vala_assert (_tmp2_, "removed"); #line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = container; -#line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); -#line 521 "ContainerSourceCollection.c" + source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_DATA_SOURCE, DataSource)); +#line 614 "ContainerSourceCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container; -#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = added; -#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = relinked; -#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); -#line 531 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL], 0, container, added, relinked); +#line 618 "ContainerSourceCollection.c" } -void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { +void +container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked) +{ #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_added (self, container, added, relinked); -#line 540 "ContainerSourceCollection.c" +#line 632 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { - ContainerSource* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; +static void +container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked) +{ #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (removed)); #line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = container; -#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = removed; -#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = unlinked; -#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_); -#line 560 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL], 0, container, removed, unlinked); +#line 648 "ContainerSourceCollection.c" } -void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { +void +container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked) +{ #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_removed (self, container, removed, unlinked); -#line 569 "ContainerSourceCollection.c" +#line 662 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) { - ContainerSource* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; - GeeCollection* _tmp3_; - gboolean _tmp4_; +static void +container_source_collection_real_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked) +{ #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -582,96 +677,109 @@ static void container_source_collection_real_notify_container_contents_altered ( #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = container; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = added; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = relinked; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = removed; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = unlinked; -#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 597 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL], 0, container, added, relinked, removed, unlinked); +#line 682 "ContainerSourceCollection.c" } -void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) { +void +container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked) +{ #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_altered (self, container, added, relinked, removed, unlinked); -#line 606 "ContainerSourceCollection.c" +#line 698 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { - ContainerSource* _tmp0_; - GeeCollection* _tmp1_; +static void +container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources) +{ #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp0_ = container; -#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = sources; -#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 623 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL], 0, container, sources); +#line 713 "ContainerSourceCollection.c" } -void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { +void +container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources) +{ #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_to_container_removed (self, container, sources); -#line 632 "ContainerSourceCollection.c" +#line 726 "ContainerSourceCollection.c" } -static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) { +static GeeCollection* +container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source) +{ #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_critical ("Type `%s' does not implement abstract method `container_source_collection_get_containers_holding_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return NULL; -#line 641 "ContainerSourceCollection.c" +#line 738 "ContainerSourceCollection.c" } -GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) { +GeeCollection* +container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, + DataSource* source) +{ #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->get_containers_holding_source (self, source); -#line 650 "ContainerSourceCollection.c" +#line 750 "ContainerSourceCollection.c" } -static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) { +static ContainerSource* +container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink) +{ #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_critical ("Type `%s' does not implement abstract method `container_source_collection_convert_backlink_to_container'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return NULL; -#line 659 "ContainerSourceCollection.c" +#line 762 "ContainerSourceCollection.c" } -ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) { +ContainerSource* +container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, + SourceBacklink* backlink) +{ #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->convert_backlink_to_container (self, backlink); -#line 668 "ContainerSourceCollection.c" +#line 774 "ContainerSourceCollection.c" } -void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) { +void +container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) +{ #line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 675 "ContainerSourceCollection.c" +#line 783 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -684,48 +792,47 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC _collection_it = _tmp1_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 688 "ContainerSourceCollection.c" +#line 796 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 703 "ContainerSourceCollection.c" +#line 808 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 717 "ContainerSourceCollection.c" +#line 822 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 721 "ContainerSourceCollection.c" +#line 826 "ContainerSourceCollection.c" } } -void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) { +void +container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) +{ #line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 729 "ContainerSourceCollection.c" +#line 836 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -738,45 +845,44 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol _collection_it = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 742 "ContainerSourceCollection.c" +#line 849 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 757 "ContainerSourceCollection.c" +#line 861 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 771 "ContainerSourceCollection.c" +#line 875 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 775 "ContainerSourceCollection.c" +#line 879 "ContainerSourceCollection.c" } } -GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self) { +GeeCollection* +container_source_collection_get_holding_tank (ContainerSourceCollection* self) +{ GeeCollection* result = NULL; GeeHashSet* _tmp0_; GeeSet* _tmp1_; @@ -793,13 +899,15 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 797 "ContainerSourceCollection.c" +#line 903 "ContainerSourceCollection.c" } -void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked) { +void +container_source_collection_init_add_unlinked (ContainerSourceCollection* self, + ContainerSource* unlinked) +{ GeeHashSet* _tmp0_; - ContainerSource* _tmp1_; #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -807,16 +915,16 @@ void container_source_collection_init_add_unlinked (ContainerSourceCollection* s #line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = unlinked; -#line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 814 "ContainerSourceCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), unlinked); +#line 920 "ContainerSourceCollection.c" } -void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked) { +void +container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, + GeeCollection* unlinked) +{ GeeHashSet* _tmp0_; - GeeCollection* _tmp1_; #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -824,19 +932,17 @@ void container_source_collection_init_add_many_unlinked (ContainerSourceCollecti #line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = unlinked; -#line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 831 "ContainerSourceCollection.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), unlinked); +#line 937 "ContainerSourceCollection.c" } -gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source) { +gboolean +container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, + ContainerSource* source) +{ gboolean result = FALSE; GeeHashSet* _tmp0_; - ContainerSource* _tmp1_; - gboolean _tmp2_; - ContainerSource* _tmp3_; #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), FALSE); #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -844,30 +950,27 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo #line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->holding_tank; #line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = source; -#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp2_) { + if (!gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source)) { #line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" result = FALSE; #line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 857 "ContainerSourceCollection.c" +#line 959 "ContainerSourceCollection.c" } #line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = source; -#line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); + source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" result = TRUE; #line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 867 "ContainerSourceCollection.c" +#line 967 "ContainerSourceCollection.c" } -static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking) { +static void +container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, + GeeCollection* unlinking) +{ GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -880,250 +983,243 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" map = _tmp0_; -#line 884 "ContainerSourceCollection.c" +#line 987 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = unlinking; + GeeIterator* _tmp1_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (unlinking, GEE_TYPE_ITERABLE, GeeIterable)); #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_it = _tmp2_; + _source_it = _tmp1_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 897 "ContainerSourceCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 997 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; GeeCollection* containers = NULL; - DataSource* _tmp7_; + DataSource* _tmp5_; + GeeCollection* _tmp6_; + gboolean _tmp7_ = FALSE; GeeCollection* _tmp8_; - gboolean _tmp9_ = FALSE; - GeeCollection* _tmp10_; -#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = _source_it; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _source_it; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 916 "ContainerSourceCollection.c" +#line 1013 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp4_; #line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = source; + _tmp5_ = source; #line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container_source_collection_get_containers_holding_source (self, _tmp7_); + _tmp6_ = container_source_collection_get_containers_holding_source (self, _tmp5_); #line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - containers = _tmp8_; + containers = _tmp6_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = containers; + _tmp8_ = containers; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp10_ == NULL) { + if (_tmp8_ == NULL) { #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = TRUE; -#line 936 "ContainerSourceCollection.c" + _tmp7_ = TRUE; +#line 1033 "ContainerSourceCollection.c" } else { - GeeCollection* _tmp11_; - gint _tmp12_; - gint _tmp13_; + GeeCollection* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = containers; + _tmp9_ = containers; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = gee_collection_get_size (_tmp11_); + _tmp10_ = gee_collection_get_size (_tmp9_); #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = _tmp13_ == 0; -#line 949 "ContainerSourceCollection.c" + _tmp7_ = _tmp11_ == 0; +#line 1046 "ContainerSourceCollection.c" } #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp9_) { + if (_tmp7_) { #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (containers); #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 959 "ContainerSourceCollection.c" +#line 1056 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeCollection* _tmp14_; - GeeIterator* _tmp15_; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = containers; + _tmp12_ = containers; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _container_it = _tmp15_; + _container_it = _tmp13_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 973 "ContainerSourceCollection.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 1070 "ContainerSourceCollection.c" + GeeIterator* _tmp14_; ContainerSource* container = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - GeeHashMultiMap* _tmp20_; + GeeIterator* _tmp15_; + gpointer _tmp16_; + GeeHashMultiMap* _tmp17_; + ContainerSource* _tmp18_; + DataSource* _tmp19_; + DataSource* _tmp20_; ContainerSource* _tmp21_; - DataSource* _tmp22_; - DataSource* _tmp23_; - ContainerSource* _tmp24_; - SourceBacklink* _tmp25_; - SourceBacklink* _tmp26_; -#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp16_ = _container_it; + SourceBacklink* _tmp22_; + SourceBacklink* _tmp23_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp14_ = _container_it; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp14_)) { #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 994 "ContainerSourceCollection.c" +#line 1088 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp18_ = _container_it; + _tmp15_ = _container_it; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp19_; + container = (ContainerSource*) _tmp16_; #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp20_ = map; + _tmp17_ = map; #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp21_ = container; + _tmp18_ = container; #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp22_ = source; + _tmp19_ = source; #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp21_, _tmp22_); + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp18_, _tmp19_); #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp23_ = source; + _tmp20_ = source; #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp24_ = container; + _tmp21_ = container; #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp25_ = container_source_get_backlink (_tmp24_); + _tmp22_ = container_source_get_backlink (_tmp21_); #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp26_ = _tmp25_; + _tmp23_ = _tmp22_; #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - data_source_set_backlink (_tmp23_, _tmp26_); + data_source_set_backlink (_tmp20_, _tmp23_); #line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_backlink_unref0 (_tmp26_); + _source_backlink_unref0 (_tmp23_); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1024 "ContainerSourceCollection.c" +#line 1118 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1028 "ContainerSourceCollection.c" +#line 1122 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (containers); #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); -#line 1034 "ContainerSourceCollection.c" +#line 1128 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1038 "ContainerSourceCollection.c" +#line 1132 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp27_; - GeeSet* _tmp28_; - GeeSet* _tmp29_; - GeeIterator* _tmp30_; - GeeIterator* _tmp31_; + GeeHashMultiMap* _tmp24_; + GeeSet* _tmp25_; + GeeSet* _tmp26_; + GeeIterator* _tmp27_; + GeeIterator* _tmp28_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp27_ = map; + _tmp24_ = map; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp28_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); + _tmp25_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp30_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp26_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _container_it = _tmp31_; + _container_it = _tmp28_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1063 "ContainerSourceCollection.c" - GeeIterator* _tmp32_; - gboolean _tmp33_; +#line 1157 "ContainerSourceCollection.c" + GeeIterator* _tmp29_; ContainerSource* container = NULL; - GeeIterator* _tmp34_; - gpointer _tmp35_; - ContainerSource* _tmp36_; - GeeHashMultiMap* _tmp37_; - ContainerSource* _tmp38_; - GeeCollection* _tmp39_; - GeeCollection* _tmp40_; + GeeIterator* _tmp30_; + gpointer _tmp31_; + ContainerSource* _tmp32_; + GeeHashMultiMap* _tmp33_; + ContainerSource* _tmp34_; + GeeCollection* _tmp35_; + GeeCollection* _tmp36_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp32_ = _container_it; + _tmp29_ = _container_it; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp33_ = gee_iterator_next (_tmp32_); -#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp33_) { + if (!gee_iterator_next (_tmp29_)) { #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1082 "ContainerSourceCollection.c" +#line 1173 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp34_ = _container_it; + _tmp30_ = _container_it; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp35_ = gee_iterator_get (_tmp34_); + _tmp31_ = gee_iterator_get (_tmp30_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp35_; + container = (ContainerSource*) _tmp31_; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp36_ = container; + _tmp32_ = container; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp37_ = map; + _tmp33_ = map; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp38_ = container; + _tmp34_ = container; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp39_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp38_); + _tmp35_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp34_); #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp40_ = _tmp39_; + _tmp36_ = _tmp35_; #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container_source_break_link_many (_tmp36_, _tmp40_); + container_source_break_link_many (_tmp32_, _tmp36_); #line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp36_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1106 "ContainerSourceCollection.c" +#line 1197 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1110 "ContainerSourceCollection.c" +#line 1201 "ContainerSourceCollection.c" } #line 143 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_thaw_attached_notifications (self); #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (map); -#line 1116 "ContainerSourceCollection.c" +#line 1207 "ContainerSourceCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 1123 "ContainerSourceCollection.c" +#line 1216 "ContainerSourceCollection.c" } -static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked) { +static void +container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, + GeeCollection* relinked) +{ GeeHashMultiMap* map = NULL; GeeHashMultiMap* _tmp0_; #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1136,299 +1232,293 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" map = _tmp0_; -#line 1140 "ContainerSourceCollection.c" +#line 1236 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = relinked; + GeeIterator* _tmp1_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relinked, GEE_TYPE_ITERABLE, GeeIterable)); #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_it = _tmp2_; + _source_it = _tmp1_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1153 "ContainerSourceCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1246 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; GeeList* backlinks = NULL; - DataSource* _tmp7_; - const gchar* _tmp8_; + DataSource* _tmp5_; + const gchar* _tmp6_; + GeeList* _tmp7_; + gboolean _tmp8_ = FALSE; GeeList* _tmp9_; - gboolean _tmp10_ = FALSE; - GeeList* _tmp11_; -#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = _source_it; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _source_it; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1173 "ContainerSourceCollection.c" +#line 1263 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp4_; #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = source; + _tmp5_ = source; #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = self->priv->backlink_name; + _tmp6_ = self->priv->backlink_name; #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = data_source_get_backlinks (_tmp7_, _tmp8_); + _tmp7_ = data_source_get_backlinks (_tmp5_, _tmp6_); #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - backlinks = _tmp9_; + backlinks = _tmp7_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = backlinks; + _tmp9_ = backlinks; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp11_ == NULL) { + if (_tmp9_ == NULL) { #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = TRUE; -#line 1195 "ContainerSourceCollection.c" + _tmp8_ = TRUE; +#line 1285 "ContainerSourceCollection.c" } else { - GeeList* _tmp12_; - gint _tmp13_; - gint _tmp14_; + GeeList* _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = backlinks; + _tmp10_ = backlinks; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = _tmp14_ == 0; -#line 1208 "ContainerSourceCollection.c" + _tmp8_ = _tmp12_ == 0; +#line 1298 "ContainerSourceCollection.c" } #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp10_) { + if (_tmp8_) { #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (backlinks); #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 1218 "ContainerSourceCollection.c" +#line 1308 "ContainerSourceCollection.c" } { GeeList* _backlink_list = NULL; - GeeList* _tmp15_; - GeeList* _tmp16_; + GeeList* _tmp13_; + GeeList* _tmp14_; gint _backlink_size = 0; - GeeList* _tmp17_; - gint _tmp18_; - gint _tmp19_; + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; gint _backlink_index = 0; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp15_ = backlinks; + _tmp13_ = backlinks; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp16_ = _g_object_ref0 (_tmp15_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _backlink_list = _tmp16_; + _backlink_list = _tmp14_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp17_ = _backlink_list; + _tmp15_ = _backlink_list; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _backlink_size = _tmp19_; + _backlink_size = _tmp17_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _backlink_index = -1; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1247 "ContainerSourceCollection.c" +#line 1337 "ContainerSourceCollection.c" + gint _tmp18_; + gint _tmp19_; gint _tmp20_; - gint _tmp21_; - gint _tmp22_; SourceBacklink* backlink = NULL; - GeeList* _tmp23_; - gint _tmp24_; - gpointer _tmp25_; + GeeList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; ContainerSource* container = NULL; - SourceBacklink* _tmp26_; - ContainerSource* _tmp27_; - ContainerSource* _tmp28_; + SourceBacklink* _tmp24_; + ContainerSource* _tmp25_; + ContainerSource* _tmp26_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp20_ = _backlink_index; + _tmp18_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _backlink_index = _tmp20_ + 1; + _backlink_index = _tmp18_ + 1; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp21_ = _backlink_index; + _tmp19_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp22_ = _backlink_size; + _tmp20_ = _backlink_size; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!(_tmp21_ < _tmp22_)) { + if (!(_tmp19_ < _tmp20_)) { #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1271 "ContainerSourceCollection.c" +#line 1361 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp23_ = _backlink_list; + _tmp21_ = _backlink_list; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp24_ = _backlink_index; + _tmp22_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp25_ = gee_list_get (_tmp23_, _tmp24_); + _tmp23_ = gee_list_get (_tmp21_, _tmp22_); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - backlink = (SourceBacklink*) _tmp25_; + backlink = (SourceBacklink*) _tmp23_; #line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp26_ = backlink; + _tmp24_ = backlink; #line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp27_ = container_source_collection_convert_backlink_to_container (self, _tmp26_); + _tmp25_ = container_source_collection_convert_backlink_to_container (self, _tmp24_); #line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = _tmp27_; + container = _tmp25_; #line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp28_ = container; + _tmp26_ = container; #line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp28_ != NULL) { -#line 1291 "ContainerSourceCollection.c" - GeeHashMultiMap* _tmp29_; - ContainerSource* _tmp30_; - DataSource* _tmp31_; + if (_tmp26_ != NULL) { +#line 1381 "ContainerSourceCollection.c" + GeeHashMultiMap* _tmp27_; + ContainerSource* _tmp28_; + DataSource* _tmp29_; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp29_ = map; + _tmp27_ = map; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp30_ = container; + _tmp28_ = container; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp31_ = source; + _tmp29_ = source; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp30_, _tmp31_); -#line 1303 "ContainerSourceCollection.c" + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp28_, _tmp29_); +#line 1393 "ContainerSourceCollection.c" } else { - DataSource* _tmp32_; - gchar* _tmp33_; + DataSource* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + SourceBacklink* _tmp33_; gchar* _tmp34_; - SourceBacklink* _tmp35_; - gchar* _tmp36_; - gchar* _tmp37_; + gchar* _tmp35_; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp32_ = source; + _tmp30_ = source; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp33_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_OBJECT, DataObject)); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp35_ = backlink; + _tmp33_ = backlink; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp36_ = source_backlink_to_string (_tmp35_); + _tmp34_ = source_backlink_to_string (_tmp33_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp37_ = _tmp36_; + _tmp35_ = _tmp34_; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_warning ("ContainerSourceCollection.vala:162: Unable to relink %s to container b" \ -"acklink %s", _tmp34_, _tmp37_); +"acklink %s", _tmp32_, _tmp35_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp35_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp34_); -#line 1329 "ContainerSourceCollection.c" + _g_free0 (_tmp32_); +#line 1419 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _source_backlink_unref0 (backlink); -#line 1335 "ContainerSourceCollection.c" +#line 1425 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_backlink_list); -#line 1339 "ContainerSourceCollection.c" +#line 1429 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (backlinks); #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (source); -#line 1345 "ContainerSourceCollection.c" +#line 1435 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1349 "ContainerSourceCollection.c" +#line 1439 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp38_; - GeeSet* _tmp39_; - GeeSet* _tmp40_; - GeeIterator* _tmp41_; - GeeIterator* _tmp42_; + GeeHashMultiMap* _tmp36_; + GeeSet* _tmp37_; + GeeSet* _tmp38_; + GeeIterator* _tmp39_; + GeeIterator* _tmp40_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp38_ = map; + _tmp36_ = map; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp39_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); + _tmp37_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp41_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable)); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp42_ = _tmp41_; + _tmp40_ = _tmp39_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp40_); + _g_object_unref0 (_tmp38_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _container_it = _tmp42_; + _container_it = _tmp40_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1374 "ContainerSourceCollection.c" - GeeIterator* _tmp43_; - gboolean _tmp44_; +#line 1464 "ContainerSourceCollection.c" + GeeIterator* _tmp41_; ContainerSource* container = NULL; - GeeIterator* _tmp45_; - gpointer _tmp46_; - ContainerSource* _tmp47_; - GeeHashMultiMap* _tmp48_; - ContainerSource* _tmp49_; - GeeCollection* _tmp50_; - GeeCollection* _tmp51_; -#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp43_ = _container_it; + GeeIterator* _tmp42_; + gpointer _tmp43_; + ContainerSource* _tmp44_; + GeeHashMultiMap* _tmp45_; + ContainerSource* _tmp46_; + GeeCollection* _tmp47_; + GeeCollection* _tmp48_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp44_ = gee_iterator_next (_tmp43_); + _tmp41_ = _container_it; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp44_) { + if (!gee_iterator_next (_tmp41_)) { #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1393 "ContainerSourceCollection.c" +#line 1480 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp45_ = _container_it; + _tmp42_ = _container_it; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp46_ = gee_iterator_get (_tmp45_); + _tmp43_ = gee_iterator_get (_tmp42_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp46_; + container = (ContainerSource*) _tmp43_; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp47_ = container; + _tmp44_ = container; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp48_ = map; + _tmp45_ = map; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp49_ = container; + _tmp46_ = container; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp50_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp49_); + _tmp47_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp46_); #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp51_ = _tmp50_; + _tmp48_ = _tmp47_; #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container_source_establish_link_many (_tmp47_, _tmp51_); + container_source_establish_link_many (_tmp44_, _tmp48_); #line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp48_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1417 "ContainerSourceCollection.c" +#line 1504 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1421 "ContainerSourceCollection.c" +#line 1508 "ContainerSourceCollection.c" } #line 171 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_thaw_attached_notifications (self); #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (map); -#line 1427 "ContainerSourceCollection.c" +#line 1514 "ContainerSourceCollection.c" } -static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, DataSource* source) { +static void +container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, + DataSource* source) +{ GeeIterator* iter = NULL; GeeHashSet* _tmp0_; GeeIterator* _tmp1_; @@ -1444,82 +1534,78 @@ static void container_source_collection_on_contained_source_destroyed (Container iter = _tmp1_; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1447 "ContainerSourceCollection.c" +#line 1537 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; ContainerSource* container = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - ContainerSource* _tmp7_; - gboolean _tmp8_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + gboolean _tmp5_ = FALSE; + ContainerSource* _tmp6_; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = iter; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1464 "ContainerSourceCollection.c" +#line 1550 "ContainerSourceCollection.c" } #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = iter; + _tmp3_ = iter; #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - container = (ContainerSource*) _tmp5_; -#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = container; + container = (ContainerSource*) _tmp4_; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container_source_has_links (_tmp7_); + _tmp6_ = container; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp8_) { -#line 1478 "ContainerSourceCollection.c" - ContainerSource* _tmp9_; + if (!container_source_has_links (_tmp6_)) { +#line 1562 "ContainerSourceCollection.c" + ContainerSource* _tmp7_; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = container; + _tmp7_ = container; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_TAG); -#line 1484 "ContainerSourceCollection.c" + _tmp5_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_TAG); +#line 1568 "ContainerSourceCollection.c" } else { #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = FALSE; -#line 1488 "ContainerSourceCollection.c" + _tmp5_ = FALSE; +#line 1572 "ContainerSourceCollection.c" } #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp6_) { -#line 1492 "ContainerSourceCollection.c" - GeeIterator* _tmp10_; - ContainerSource* _tmp11_; + if (_tmp5_) { +#line 1576 "ContainerSourceCollection.c" + GeeIterator* _tmp8_; + ContainerSource* _tmp9_; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = iter; + _tmp8_ = iter; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_iterator_remove (_tmp10_); + gee_iterator_remove (_tmp8_); #line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = container; + _tmp9_ = container; #line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource), TRUE); -#line 1503 "ContainerSourceCollection.c" + data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource), TRUE); +#line 1587 "ContainerSourceCollection.c" } #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1507 "ContainerSourceCollection.c" +#line 1591 "ContainerSourceCollection.c" } #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (iter); -#line 1511 "ContainerSourceCollection.c" +#line 1595 "ContainerSourceCollection.c" } -static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source) { +static void +container_source_collection_real_notify_item_destroyed (SourceCollection* base, + DataSource* source) +{ ContainerSourceCollection * self; - DataSource* _tmp10_; #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); #line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1522 "ContainerSourceCollection.c" +#line 1608 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -1532,69 +1618,63 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec _collection_it = _tmp1_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1535 "ContainerSourceCollection.c" +#line 1621 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - DataSource* _tmp7_; - SourceBacklink* _tmp8_; - SourceBacklink* _tmp9_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + SourceBacklink* _tmp6_; + SourceBacklink* _tmp7_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1553 "ContainerSourceCollection.c" +#line 1635 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = source; + _tmp6_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONTAINER_SOURCE, ContainerSource)); + _tmp7_ = _tmp6_; #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = _tmp8_; + source_collection_remove_backlink (_tmp5_, _tmp7_); #line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source_collection_remove_backlink (_tmp6_, _tmp9_); -#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_backlink_unref0 (_tmp9_); + _source_backlink_unref0 (_tmp7_); #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1575 "ContainerSourceCollection.c" +#line 1655 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1579 "ContainerSourceCollection.c" +#line 1659 "ContainerSourceCollection.c" } #line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = source; -#line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_item_destroyed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp10_); -#line 1585 "ContainerSourceCollection.c" + SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_item_destroyed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), source); +#line 1663 "ContainerSourceCollection.c" } -void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container) { - ContainerSource* _tmp21_; - Marker* _tmp22_; - Marker* _tmp23_; +void +container_source_collection_evaporate (ContainerSourceCollection* self, + ContainerSource* container) +{ + Marker* _tmp15_; + Marker* _tmp16_; #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); -#line 1597 "ContainerSourceCollection.c" +#line 1677 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -1607,155 +1687,147 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _collection_it = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1610 "ContainerSourceCollection.c" +#line 1690 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - ContainerSource* _tmp7_; - SourceBacklink* _tmp8_; - SourceBacklink* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + SourceBacklink* _tmp6_; + SourceBacklink* _tmp7_; + gboolean _tmp8_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1630 "ContainerSourceCollection.c" +#line 1705 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; -#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; -#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = container; + collection = (SourceCollection*) _tmp4_; #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = container_source_get_backlink (_tmp7_); + _tmp5_ = collection; #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = _tmp8_; + _tmp6_ = container_source_get_backlink (container); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = source_collection_has_backlink (_tmp6_, _tmp9_); + _tmp7_ = _tmp6_; #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = source_collection_has_backlink (_tmp5_, _tmp7_); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _source_backlink_unref0 (_tmp9_); + _source_backlink_unref0 (_tmp7_); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp11_) { -#line 1654 "ContainerSourceCollection.c" - ContainerSource* _tmp12_; - Marker* _tmp13_; - Marker* _tmp14_; - GeeCollection* _tmp15_; - GeeCollection* _tmp16_; + if (_tmp8_) { +#line 1725 "ContainerSourceCollection.c" + Marker* _tmp9_; + Marker* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; gboolean added = FALSE; - GeeHashSet* _tmp17_; - ContainerSource* _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; + GeeHashSet* _tmp13_; + gboolean _tmp14_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = container; + _tmp9_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_DATA_OBJECT, DataObject)); #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); + _tmp10_ = _tmp9_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = _tmp13_; + _tmp11_ = source_collection_unlink_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp10_, NULL, NULL); #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp15_ = source_collection_unlink_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, NULL, NULL); + _tmp12_ = _tmp11_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp16_ = _tmp15_; + _g_object_unref0 (_tmp12_); #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp16_); -#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp14_); -#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp17_ = self->priv->holding_tank; + _g_object_unref0 (_tmp10_); #line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp18_ = container; + _tmp13_ = self->priv->holding_tank; #line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp19_ = gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); -#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - added = _tmp19_; + added = gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), container); #line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp20_ = added; + _tmp14_ = added; #line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _vala_assert (_tmp20_, "added"); + _vala_assert (_tmp14_, "added"); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1697 "ContainerSourceCollection.c" +#line 1759 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1701 "ContainerSourceCollection.c" +#line 1763 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1705 "ContainerSourceCollection.c" +#line 1767 "ContainerSourceCollection.c" } #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp21_ = container; + _tmp15_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (container, TYPE_DATA_OBJECT, DataObject)); #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp22_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); + _tmp16_ = _tmp15_; #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp23_ = _tmp22_; + source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp16_, TRUE, NULL, NULL, NULL); #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp23_, TRUE, NULL, NULL, NULL); -#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_object_unref0 (_tmp23_); -#line 1717 "ContainerSourceCollection.c" + _g_object_unref0 (_tmp16_); +#line 1777 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) { +static void +_container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, + GeeCollection* unlinking, + gpointer self) +{ #line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_sources_unlinking ((ContainerSourceCollection*) self, unlinking); -#line 1724 "ContainerSourceCollection.c" +#line 1788 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) { +static void +_container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, + GeeCollection* relinked, + gpointer self) +{ #line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_sources_relinked ((ContainerSourceCollection*) self, relinked); -#line 1731 "ContainerSourceCollection.c" +#line 1799 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source); -#line 1738 "ContainerSourceCollection.c" +#line 1810 "ContainerSourceCollection.c" } -static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source); -#line 1745 "ContainerSourceCollection.c" +#line 1821 "ContainerSourceCollection.c" } -void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection) { +void +container_source_collection_attach_collection (ContainerSourceCollection* self, + SourceCollection* collection) +{ GeeHashSet* _tmp0_; - SourceCollection* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp8_; - SourceCollection* _tmp9_; - SourceCollection* _tmp10_; - SourceCollection* _tmp11_; - SourceCollection* _tmp12_; - SourceCollection* _tmp13_; + GeeHashSet* _tmp5_; #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1763,69 +1835,54 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s #line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp1_ = collection; -#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (_tmp2_) { -#line 1771 "ContainerSourceCollection.c" - SourceCollection* _tmp3_; + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), collection)) { +#line 1839 "ContainerSourceCollection.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = collection; #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp1_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (collection, TYPE_DATA_COLLECTION, DataCollection)); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + _tmp3_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_warning ("ContainerSourceCollection.vala:215: attempted to multiple-attach '%s' " \ -"to '%s'", _tmp5_, _tmp7_); +"to '%s'", _tmp2_, _tmp4_); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 216 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1795 "ContainerSourceCollection.c" +#line 1860 "ContainerSourceCollection.c" } #line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = self->priv->attached_collections; + _tmp5_ = self->priv->attached_collections; #line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp9_ = collection; -#line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); -#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = collection; + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), collection); #line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_connect (_tmp10_, "items-unlinking", (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self); + g_signal_connect (collection, "items-unlinking", (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self); #line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp11_ = collection; -#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_connect (_tmp11_, "items-relinked", (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self); -#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = collection; + g_signal_connect (collection, "items-relinked", (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self); #line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_connect (_tmp12_, "item-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (collection, "item-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self); #line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp13_ = collection; -#line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_connect (_tmp13_, "unlinked-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); -#line 1819 "ContainerSourceCollection.c" + g_signal_connect (collection, "unlinked-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); +#line 1874 "ContainerSourceCollection.c" } -void container_source_collection_detach_all_collections (ContainerSourceCollection* self) { - GeeHashSet* _tmp14_; +void +container_source_collection_detach_all_collections (ContainerSourceCollection* self) +{ + GeeHashSet* _tmp13_; #line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 1827 "ContainerSourceCollection.c" +#line 1884 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; GeeHashSet* _tmp0_; @@ -1838,86 +1895,95 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti _collection_it = _tmp1_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1840 "ContainerSourceCollection.c" +#line 1897 "ContainerSourceCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - SourceCollection* _tmp6_; - guint _tmp7_; - SourceCollection* _tmp8_; - guint _tmp9_; - SourceCollection* _tmp10_; - guint _tmp11_; - SourceCollection* _tmp12_; - guint _tmp13_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + SourceCollection* _tmp5_; + guint _tmp6_; + SourceCollection* _tmp7_; + guint _tmp8_; + SourceCollection* _tmp9_; + guint _tmp10_; + SourceCollection* _tmp11_; + guint _tmp12_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1862 "ContainerSourceCollection.c" +#line 1916 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp4_ = _collection_it; + _tmp3_ = _collection_it; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - collection = (SourceCollection*) _tmp5_; + collection = (SourceCollection*) _tmp4_; #line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp6_ = collection; + _tmp5_ = collection; #line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("items-unlinking", TYPE_SOURCE_COLLECTION, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("items-unlinking", TYPE_SOURCE_COLLECTION, &_tmp6_, NULL, FALSE); #line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self); + g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self); #line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp8_ = collection; + _tmp7_ = collection; #line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("items-relinked", TYPE_SOURCE_COLLECTION, &_tmp9_, NULL, FALSE); + g_signal_parse_name ("items-relinked", TYPE_SOURCE_COLLECTION, &_tmp8_, NULL, FALSE); #line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self); + g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self); #line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp10_ = collection; + _tmp9_ = collection; #line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self); #line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp12_ = collection; + _tmp11_ = collection; #line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_parse_name ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, &_tmp13_, NULL, FALSE); + g_signal_parse_name ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, &_tmp12_, NULL, FALSE); #line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); + g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self); #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1896 "ContainerSourceCollection.c" +#line 1950 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1900 "ContainerSourceCollection.c" +#line 1954 "ContainerSourceCollection.c" } #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - _tmp14_ = self->priv->attached_collections; + _tmp13_ = self->priv->attached_collections; #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1906 "ContainerSourceCollection.c" + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 1960 "ContainerSourceCollection.c" } -static void container_source_collection_real_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { +static void +container_source_collection_real_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked) +{ #line 20 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 20 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (added)); -#line 1915 "ContainerSourceCollection.c" +#line 1974 "ContainerSourceCollection.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (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_BOOLEAN (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_BOOLEAN) (gpointer data1, gpointer arg_1, gpointer arg_2, gboolean arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN callback; register GCClosure * cc; @@ -1932,43 +1998,62 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN (GClosure * clos data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1934 "ContainerSourceCollection.c" +#line 2000 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 1940 "ContainerSourceCollection.c" +#line 2006 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), data2); -#line 1946 "ContainerSourceCollection.c" +#line 2012 "ContainerSourceCollection.c" } -static void container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { +static void +container_source_collection_real_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked) +{ #line 24 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 24 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (removed)); -#line 1955 "ContainerSourceCollection.c" +#line 2026 "ContainerSourceCollection.c" } -static void container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) { +static void +container_source_collection_real_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked) +{ #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 28 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 1966 "ContainerSourceCollection.c" +#line 2044 "ContainerSourceCollection.c" } -static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (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_BOOLEAN_OBJECT_BOOLEAN (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_BOOLEAN_OBJECT_BOOLEAN) (gpointer data1, gpointer arg_1, gpointer arg_2, gboolean arg_3, gpointer arg_4, gboolean arg_5, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN callback; register GCClosure * cc; @@ -1983,32 +2068,43 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN ( data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1985 "ContainerSourceCollection.c" +#line 2070 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 1991 "ContainerSourceCollection.c" +#line 2076 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_object (param_values + 4), g_value_get_boolean (param_values + 5), data2); -#line 1997 "ContainerSourceCollection.c" +#line 2082 "ContainerSourceCollection.c" } -static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { +static void +container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* sources) +{ #line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE (container)); #line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 2006 "ContainerSourceCollection.c" +#line 2095 "ContainerSourceCollection.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; @@ -2023,23 +2119,25 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2025 "ContainerSourceCollection.c" +#line 2121 "ContainerSourceCollection.c" } else { #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" data2 = closure->data; -#line 2031 "ContainerSourceCollection.c" +#line 2127 "ContainerSourceCollection.c" } #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 2037 "ContainerSourceCollection.c" +#line 2133 "ContainerSourceCollection.c" } -static void container_source_collection_class_init (ContainerSourceCollectionClass * klass) { +static void +container_source_collection_class_init (ContainerSourceCollectionClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2078,11 +2176,13 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("container-contents-altered", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN, G_TYPE_NONE, 5, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL] = g_signal_new ("backlink-to-container-removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, backlink_to_container_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION); -#line 2080 "ContainerSourceCollection.c" +#line 2178 "ContainerSourceCollection.c" } -static void container_source_collection_instance_init (ContainerSourceCollection * self) { +static void +container_source_collection_instance_init (ContainerSourceCollection * self) +{ GeeHashSet* _tmp0_; GeeHashSet* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2095,11 +2195,13 @@ static void container_source_collection_instance_init (ContainerSourceCollection _tmp1_ = gee_hash_set_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 18 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self->priv->holding_tank = _tmp1_; -#line 2097 "ContainerSourceCollection.c" +#line 2197 "ContainerSourceCollection.c" } -static void container_source_collection_finalize (DataCollection * obj) { +static void +container_source_collection_finalize (DataCollection * obj) +{ ContainerSourceCollection * self; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection); @@ -2113,11 +2215,13 @@ static void container_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->holding_tank); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" DATA_COLLECTION_CLASS (container_source_collection_parent_class)->finalize (obj); -#line 2115 "ContainerSourceCollection.c" +#line 2217 "ContainerSourceCollection.c" } -GType container_source_collection_get_type (void) { +GType +container_source_collection_get_type (void) +{ static volatile gsize container_source_collection_type_id__volatile = 0; if (g_once_init_enter (&container_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ContainerSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) container_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ContainerSourceCollection), 0, (GInstanceInitFunc) container_source_collection_instance_init, NULL }; diff --git a/src/core/Core.c b/src/core/Core.c index bb3c27b..df6c104 100644 --- a/src/core/Core.c +++ b/src/core/Core.c @@ -1,4 +1,4 @@ -/* Core.c generated by valac 0.36.6, the Vala compiler +/* Core.c generated by valac 0.40.4, the Vala compiler * generated from Core.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include @@ -26,15 +27,21 @@ void core_init (GError** error); void core_terminate (void); -void core_preconfigure (void) { +void +core_preconfigure (void) +{ } -void core_init (GError** error) { +void +core_init (GError** error) +{ } -void core_terminate (void) { +void +core_terminate (void) +{ } 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 #include #include @@ -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" } } diff --git a/src/core/DataObject.c b/src/core/DataObject.c index a34dc93..1f966d2 100644 --- a/src/core/DataObject.c +++ b/src/core/DataObject.c @@ -1,4 +1,4 @@ -/* DataObject.c generated by valac 0.36.6, the Vala compiler +/* DataObject.c generated by valac 0.40.4, the Vala compiler * generated from DataObject.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -20,6 +20,7 @@ /* Have to inherit from Object due to ContainerSource and this bug:*/ /* https://bugzilla.gnome.org/show_bug.cgi?id=615904*/ + #include #include #include @@ -56,6 +57,11 @@ typedef struct _AlterationClass AlterationClass; typedef struct _DataCollection DataCollection; typedef struct _DataCollectionClass DataCollectionClass; +enum { + DATA_OBJECT_0_PROPERTY, + DATA_OBJECT_NUM_PROPERTIES +}; +static GParamSpec* data_object_properties[DATA_OBJECT_NUM_PROPERTIES]; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -93,91 +99,132 @@ static gint64 data_object_object_id_generator = (gint64) 0; 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; 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; #define DATA_OBJECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_OBJECT, DataObjectPrivate)) -enum { - DATA_OBJECT_DUMMY_PROPERTY -}; #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) #define DATA_COLLECTION_INVALID_OBJECT_ORDINAL ((gint64) -1) -DataObject* data_object_construct (GType object_type, gint64 object_id); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -static void data_object_real_notify_altered (DataObject* self, Alteration* alteration); -void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); -static void data_object_real_notify_membership_changed (DataObject* self, DataCollection* collection); -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); -static void data_object_real_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val); -void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name); -static void data_object_real_notify_collection_property_cleared (DataObject* self, const gchar* name); +DataObject* data_object_construct (GType object_type, + gint64 object_id); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +static void data_object_real_notify_altered (DataObject* self, + Alteration* alteration); +void data_collection_internal_notify_altered (DataCollection* self, + DataObject* object, + Alteration* alteration); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); +static void data_object_real_notify_membership_changed (DataObject* self, + DataCollection* collection); +void data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); +static void data_object_real_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val); +void data_object_notify_collection_property_cleared (DataObject* self, + const gchar* name); +static void data_object_real_notify_collection_property_cleared (DataObject* self, + const gchar* name); gchar* data_object_get_name (DataObject* self); static gchar* data_object_real_get_name (DataObject* self); gchar* data_object_to_string (DataObject* self); static gchar* data_object_real_to_string (DataObject* self); DataCollection* data_object_get_membership (DataObject* self); gboolean data_object_has_membership (DataObject* self); -void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal); -void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal); +void data_object_internal_set_membership (DataObject* self, + DataCollection* collection, + gint64 ordinal); +void data_object_internal_set_ordinal (DataObject* self, + gint64 ordinal); void data_object_internal_clear_membership (DataObject* self); gint64 data_object_internal_get_ordinal (DataObject* self); gint64 data_object_get_object_id (DataObject* self); -void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result); -GValue* data_collection_get_property (DataCollection* self, const gchar* name); +void data_object_get_collection_property (DataObject* self, + const gchar* name, + GValue* def, + GValue* result); +GValue* data_collection_get_property (DataCollection* self, + const gchar* name); static void _vala_GValue_free (GValue* self); -void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); -void data_object_clear_collection_property (DataObject* self, const gchar* name); -void data_collection_clear_property (DataCollection* self, const gchar* name); +void data_object_set_collection_property (DataObject* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); +void data_object_clear_collection_property (DataObject* self, + const gchar* name); +void data_collection_clear_property (DataCollection* self, + const gchar* name); static void data_object_finalize (GObject * obj); -DataObject* data_object_construct (GType object_type, gint64 object_id) { +DataObject* +data_object_construct (GType object_type, + gint64 object_id) +{ DataObject * self = NULL; gint64 _tmp0_ = 0LL; - gint64 _tmp1_; #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala" self = (DataObject*) g_object_new (object_type, NULL); #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = object_id; -#line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (_tmp1_ == DATA_OBJECT_INVALID_OBJECT_ID) { -#line 156 "DataObject.c" - gint64 _tmp2_; + if (object_id == DATA_OBJECT_INVALID_OBJECT_ID) { +#line 203 "DataObject.c" + gint64 _tmp1_; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = data_object_object_id_generator; + _tmp1_ = data_object_object_id_generator; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_object_object_id_generator = _tmp2_ + 1; + data_object_object_id_generator = _tmp1_ + 1; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp0_ = _tmp2_; -#line 164 "DataObject.c" + _tmp0_ = _tmp1_; +#line 211 "DataObject.c" } else { - gint64 _tmp3_; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = object_id; -#line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp0_ = _tmp3_; -#line 171 "DataObject.c" + _tmp0_ = object_id; +#line 215 "DataObject.c" } #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv->object_id = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala" return self; -#line 177 "DataObject.c" +#line 221 "DataObject.c" } -static void data_object_real_notify_altered (DataObject* self, Alteration* alteration) { +static void +data_object_real_notify_altered (DataObject* self, + Alteration* alteration) +{ DataCollection* _tmp0_; #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_ALTERATION (alteration)); @@ -185,123 +232,157 @@ static void data_object_real_notify_altered (DataObject* self, Alteration* alter _tmp0_ = self->priv->member_of; #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { -#line 189 "DataObject.c" +#line 236 "DataObject.c" DataCollection* _tmp1_; - Alteration* _tmp2_; #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = alteration; -#line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_collection_internal_notify_altered (_tmp1_, self, _tmp2_); -#line 198 "DataObject.c" + data_collection_internal_notify_altered (_tmp1_, self, alteration); +#line 242 "DataObject.c" } } -void data_object_notify_altered (DataObject* self, Alteration* alteration) { +void +data_object_notify_altered (DataObject* self, + Alteration* alteration) +{ #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_altered (self, alteration); -#line 208 "DataObject.c" +#line 255 "DataObject.c" } -static void data_object_real_notify_membership_changed (DataObject* self, DataCollection* collection) { +static void +data_object_real_notify_membership_changed (DataObject* self, + DataCollection* collection) +{ #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection)); -#line 215 "DataObject.c" +#line 265 "DataObject.c" } -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection) { +void +data_object_notify_membership_changed (DataObject* self, + DataCollection* collection) +{ #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_membership_changed (self, collection); -#line 224 "DataObject.c" +#line 277 "DataObject.c" } -static void data_object_real_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val) { +static void +data_object_real_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (name != NULL); #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (val != NULL); -#line 233 "DataObject.c" +#line 291 "DataObject.c" } -void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val) { +void +data_object_notify_collection_property_set (DataObject* self, + const gchar* name, + GValue* old, + GValue* val) +{ #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_collection_property_set (self, name, old, val); -#line 242 "DataObject.c" +#line 305 "DataObject.c" } -static void data_object_real_notify_collection_property_cleared (DataObject* self, const gchar* name) { +static void +data_object_real_notify_collection_property_cleared (DataObject* self, + const gchar* name) +{ #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (name != NULL); -#line 249 "DataObject.c" +#line 315 "DataObject.c" } -void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name) { +void +data_object_notify_collection_property_cleared (DataObject* self, + const gchar* name) +{ #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala" DATA_OBJECT_GET_CLASS (self)->notify_collection_property_cleared (self, name); -#line 258 "DataObject.c" +#line 327 "DataObject.c" } -static gchar* data_object_real_get_name (DataObject* self) { +static gchar* +data_object_real_get_name (DataObject* self) +{ #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_critical ("Type `%s' does not implement abstract method `data_object_get_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" return NULL; -#line 267 "DataObject.c" +#line 338 "DataObject.c" } -gchar* data_object_get_name (DataObject* self) { +gchar* +data_object_get_name (DataObject* self) +{ #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), NULL); #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala" return DATA_OBJECT_GET_CLASS (self)->get_name (self); -#line 276 "DataObject.c" +#line 349 "DataObject.c" } -static gchar* data_object_real_to_string (DataObject* self) { +static gchar* +data_object_real_to_string (DataObject* self) +{ #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_critical ("Type `%s' does not implement abstract method `data_object_to_string'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" return NULL; -#line 285 "DataObject.c" +#line 360 "DataObject.c" } -gchar* data_object_to_string (DataObject* self) { +gchar* +data_object_to_string (DataObject* self) +{ #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), NULL); #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala" return DATA_OBJECT_GET_CLASS (self)->to_string (self); -#line 294 "DataObject.c" +#line 371 "DataObject.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala" return self ? data_collection_ref (self) : NULL; -#line 301 "DataObject.c" +#line 380 "DataObject.c" } -DataCollection* data_object_get_membership (DataObject* self) { +DataCollection* +data_object_get_membership (DataObject* self) +{ DataCollection* result = NULL; DataCollection* _tmp0_; DataCollection* _tmp1_; @@ -315,11 +396,13 @@ DataCollection* data_object_get_membership (DataObject* self) { result = _tmp1_; #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 319 "DataObject.c" +#line 400 "DataObject.c" } -gboolean data_object_has_membership (DataObject* self) { +gboolean +data_object_has_membership (DataObject* self) +{ gboolean result = FALSE; DataCollection* _tmp0_; #line 77 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -330,15 +413,17 @@ gboolean data_object_has_membership (DataObject* self) { result = _tmp0_ != NULL; #line 78 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 334 "DataObject.c" +#line 417 "DataObject.c" } -void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal) { +void +data_object_internal_set_membership (DataObject* self, + DataCollection* collection, + gint64 ordinal) +{ DataCollection* _tmp0_; DataCollection* _tmp1_; - DataCollection* _tmp2_; - gint64 _tmp3_; #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -348,24 +433,22 @@ void data_object_internal_set_membership (DataObject* self, DataCollection* coll #line 84 "/home/jens/Source/shotwell/src/core/DataObject.vala" _vala_assert (_tmp0_ == NULL, "member_of == null"); #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = collection; -#line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = _data_collection_ref0 (_tmp1_); + _tmp1_ = _data_collection_ref0 (collection); #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" _data_collection_unref0 (self->priv->member_of); #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala" - self->priv->member_of = _tmp2_; + self->priv->member_of = _tmp1_; #line 87 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = ordinal; -#line 87 "/home/jens/Source/shotwell/src/core/DataObject.vala" - self->priv->ordinal = _tmp3_; -#line 363 "DataObject.c" + self->priv->ordinal = ordinal; +#line 444 "DataObject.c" } -void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) { +void +data_object_internal_set_ordinal (DataObject* self, + gint64 ordinal) +{ DataCollection* _tmp0_; - gint64 _tmp1_; #line 96 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -373,14 +456,14 @@ void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) { #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala" _vala_assert (_tmp0_ == NULL, "member_of == null"); #line 99 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = ordinal; -#line 99 "/home/jens/Source/shotwell/src/core/DataObject.vala" - self->priv->ordinal = _tmp1_; -#line 380 "DataObject.c" + self->priv->ordinal = ordinal; +#line 461 "DataObject.c" } -void data_object_internal_clear_membership (DataObject* self) { +void +data_object_internal_clear_membership (DataObject* self) +{ #line 104 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 105 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -389,11 +472,13 @@ void data_object_internal_clear_membership (DataObject* self) { self->priv->member_of = NULL; #line 106 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv->ordinal = DATA_COLLECTION_INVALID_OBJECT_ORDINAL; -#line 393 "DataObject.c" +#line 476 "DataObject.c" } -inline gint64 data_object_internal_get_ordinal (DataObject* self) { +inline gint64 +data_object_internal_get_ordinal (DataObject* self) +{ gint64 result = 0LL; gint64 _tmp0_; #line 110 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -404,11 +489,13 @@ inline gint64 data_object_internal_get_ordinal (DataObject* self) { result = _tmp0_; #line 111 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 408 "DataObject.c" +#line 493 "DataObject.c" } -inline gint64 data_object_get_object_id (DataObject* self) { +inline gint64 +data_object_get_object_id (DataObject* self) +{ gint64 result = 0LL; gint64 _tmp0_; #line 114 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -419,28 +506,34 @@ inline gint64 data_object_get_object_id (DataObject* self) { result = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/core/DataObject.vala" return result; -#line 423 "DataObject.c" +#line 510 "DataObject.c" } -static void _vala_GValue_free (GValue* self) { +static void +_vala_GValue_free (GValue* self) +{ #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_value_unset (self); #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_free (self); -#line 432 "DataObject.c" +#line 521 "DataObject.c" } -void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result) { +void +data_object_get_collection_property (DataObject* self, + const gchar* name, + GValue* def, + GValue* result) +{ DataCollection* _tmp0_; GValue* _result_ = NULL; - DataCollection* _tmp3_; - const gchar* _tmp4_; + DataCollection* _tmp2_; + GValue* _tmp3_; + GValue* _tmp4_ = NULL; GValue* _tmp5_; - GValue* _tmp6_ = NULL; - GValue* _tmp7_; - GValue _tmp10_ = {0}; + GValue _tmp7_ = {0}; #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -449,79 +542,77 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G _tmp0_ = self->priv->member_of; #line 119 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ == NULL) { -#line 453 "DataObject.c" - GValue* _tmp1_; - GValue _tmp2_ = {0}; -#line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp1_ = def; +#line 546 "DataObject.c" + GValue _tmp1_ = {0}; #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (G_IS_VALUE (_tmp1_)) { + if (G_IS_VALUE (def)) { #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_init (&_tmp2_, G_VALUE_TYPE (_tmp1_)); + g_value_init (&_tmp1_, G_VALUE_TYPE (def)); #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_copy (_tmp1_, &_tmp2_); -#line 464 "DataObject.c" + g_value_copy (def, &_tmp1_); +#line 554 "DataObject.c" } else { #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = *_tmp1_; -#line 468 "DataObject.c" + _tmp1_ = *def; +#line 558 "DataObject.c" } #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" - *result = _tmp2_; + *result = _tmp1_; #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" return; -#line 474 "DataObject.c" +#line 564 "DataObject.c" } #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = self->priv->member_of; + _tmp2_ = self->priv->member_of; #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp4_ = name; + _tmp3_ = data_collection_get_property (_tmp2_, name); #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp5_ = data_collection_get_property (_tmp3_, _tmp4_); -#line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _result_ = _tmp5_; + _result_ = _tmp3_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp7_ = _result_; + _tmp5_ = _result_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (_tmp7_ != NULL) { -#line 488 "DataObject.c" - GValue* _tmp8_; + if (_tmp5_ != NULL) { +#line 576 "DataObject.c" + GValue* _tmp6_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp8_ = _result_; + _tmp6_ = _result_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp6_ = _tmp8_; -#line 494 "DataObject.c" + _tmp4_ = _tmp6_; +#line 582 "DataObject.c" } else { - GValue* _tmp9_; -#line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp9_ = def; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp6_ = _tmp9_; -#line 501 "DataObject.c" + _tmp4_ = def; +#line 586 "DataObject.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - if (G_IS_VALUE (_tmp6_)) { + if (G_IS_VALUE (_tmp4_)) { #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_init (&_tmp10_, G_VALUE_TYPE (_tmp6_)); + g_value_init (&_tmp7_, G_VALUE_TYPE (_tmp4_)); #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - g_value_copy (_tmp6_, &_tmp10_); -#line 509 "DataObject.c" + g_value_copy (_tmp4_, &_tmp7_); +#line 594 "DataObject.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp10_ = *_tmp6_; -#line 513 "DataObject.c" + _tmp7_ = *_tmp4_; +#line 598 "DataObject.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" - *result = _tmp10_; + *result = _tmp7_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" __vala_GValue_free0 (_result_); #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" return; -#line 521 "DataObject.c" +#line 606 "DataObject.c" } -void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) { +void +data_object_set_collection_property (DataObject* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target) +{ DataCollection* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); @@ -533,30 +624,24 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G _tmp0_ = self->priv->member_of; #line 128 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { -#line 537 "DataObject.c" +#line 628 "DataObject.c" DataCollection* _tmp1_; - const gchar* _tmp2_; - GValue _tmp3_; - ValueEqualFunc _tmp4_; - void* _tmp4__target; + GValue _tmp2_; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = name; -#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp3_ = *val; -#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp4_ = value_equals; + _tmp2_ = *val; #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp4__target = value_equals_target; -#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_collection_set_property (_tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target); -#line 555 "DataObject.c" + data_collection_set_property (_tmp1_, name, &_tmp2_, value_equals, value_equals_target); +#line 637 "DataObject.c" } } -void data_object_clear_collection_property (DataObject* self, const gchar* name) { +void +data_object_clear_collection_property (DataObject* self, + const gchar* name) +{ DataCollection* _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); @@ -566,21 +651,20 @@ void data_object_clear_collection_property (DataObject* self, const gchar* name) _tmp0_ = self->priv->member_of; #line 133 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { -#line 570 "DataObject.c" +#line 655 "DataObject.c" DataCollection* _tmp1_; - const gchar* _tmp2_; #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = self->priv->member_of; #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" - _tmp2_ = name; -#line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala" - data_collection_clear_property (_tmp1_, _tmp2_); -#line 579 "DataObject.c" + data_collection_clear_property (_tmp1_, name); +#line 661 "DataObject.c" } } -static void data_object_class_init (DataObjectClass * klass) { +static void +data_object_class_init (DataObjectClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" data_object_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -599,11 +683,13 @@ static void data_object_class_init (DataObjectClass * klass) { ((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_object_real_to_string; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" G_OBJECT_CLASS (klass)->finalize = data_object_finalize; -#line 603 "DataObject.c" +#line 687 "DataObject.c" } -static void data_object_instance_init (DataObject * self) { +static void +data_object_instance_init (DataObject * self) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv = DATA_OBJECT_GET_PRIVATE (self); #line 32 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -612,11 +698,13 @@ static void data_object_instance_init (DataObject * self) { self->priv->member_of = NULL; #line 34 "/home/jens/Source/shotwell/src/core/DataObject.vala" self->priv->ordinal = DATA_COLLECTION_INVALID_OBJECT_ORDINAL; -#line 616 "DataObject.c" +#line 702 "DataObject.c" } -static void data_object_finalize (GObject * obj) { +static void +data_object_finalize (GObject * obj) +{ DataObject * self; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_OBJECT, DataObject); @@ -624,11 +712,13 @@ static void data_object_finalize (GObject * obj) { _data_collection_unref0 (self->priv->member_of); #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" G_OBJECT_CLASS (data_object_parent_class)->finalize (obj); -#line 628 "DataObject.c" +#line 716 "DataObject.c" } -GType data_object_get_type (void) { +GType +data_object_get_type (void) +{ static volatile gsize data_object_type_id__volatile = 0; if (g_once_init_enter (&data_object_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataObjectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_object_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataObject), 0, (GInstanceInitFunc) data_object_instance_init, NULL }; diff --git a/src/core/DataSet.c b/src/core/DataSet.c index cc12b64..367fefc 100644 --- a/src/core/DataSet.c +++ b/src/core/DataSet.c @@ -1,4 +1,4 @@ -/* DataSet.c generated by valac 0.36.6, the Vala compiler +/* DataSet.c generated by valac 0.40.4, the Vala compiler * generated from DataSet.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -26,6 +26,7 @@ /* ComparatorPredicate is used to determine if a re-sort operation is necessary; it has no*/ /* effect on adding a DataObject to a DataSet in sorted order.*/ + #include #include #include @@ -112,60 +113,114 @@ static gpointer data_set_parent_class = NULL; 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; 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; GType sorted_list_get_type (void) G_GNUC_CONST; #define DATA_SET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_SET, DataSetPrivate)) -enum { - DATA_SET_DUMMY_PROPERTY -}; -SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); -SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target); +SortedList* sorted_list_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); +SortedList* sorted_list_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + Comparator cmp, + void* cmp_target); DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); void data_set_reset_comparator (DataSet* self); -static gint64 data_set_order_added_comparator (DataSet* self, void* a, void* b); +static gint64 data_set_order_added_comparator (DataSet* self, + void* a, + void* b); gint64 data_object_internal_get_ordinal (DataObject* self); -static gboolean data_set_order_added_predicate (DataSet* self, DataObject* object, Alteration* alteration); -static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b); -gboolean data_set_contains (DataSet* self, DataObject* object); +static gboolean data_set_order_added_predicate (DataSet* self, + DataObject* object, + Alteration* alteration); +static gint64 data_set_comparator_wrapper (DataSet* self, + void* a, + void* b); +gboolean data_set_contains (DataSet* self, + DataObject* object); gint data_set_get_count (DataSet* self); gint sorted_list_get_count (SortedList* self); -static gboolean _data_set_order_added_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target); -static gint64 _data_set_order_added_comparator_comparator (void* a, void* b, gpointer self); -Comparator data_set_get_comparator (DataSet* self, void** result_target); -ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target); -void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target); -static gint64 _data_set_comparator_wrapper_comparator (void* a, void* b, gpointer self); +static gboolean _data_set_order_added_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +void sorted_list_resort (SortedList* self, + Comparator new_cmp, + void* new_cmp_target); +static gint64 _data_set_order_added_comparator_comparator (void* a, + void* b, + gpointer self); +Comparator data_set_get_comparator (DataSet* self, + void** result_target); +ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, + void** result_target); +void data_set_set_comparator (DataSet* self, + Comparator user_comparator, + void* user_comparator_target, + ComparatorPredicate comparator_predicate, + void* comparator_predicate_target); +static gint64 _data_set_comparator_wrapper_comparator (void* a, + void* b, + gpointer self); GeeList* data_set_get_all (DataSet* self); GeeList* sorted_list_get_read_only_view_as_list (SortedList* self); DataSet* data_set_copy (DataSet* self); SortedList* sorted_list_copy (SortedList* self); -DataObject* data_set_get_at (DataSet* self, gint index); -gpointer sorted_list_get_at (SortedList* self, gint index); -gint data_set_index_of (DataSet* self, DataObject* object); -gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altered, GEqualFunc equal_func); -gboolean data_set_add (DataSet* self, DataObject* object); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -gboolean data_set_remove (DataSet* self, DataObject* object); -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects); -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration); -gboolean sorted_list_resort_item (SortedList* self, gconstpointer item); +DataObject* data_set_get_at (DataSet* self, + gint index); +gpointer sorted_list_get_at (SortedList* self, + gint index); +gint data_set_index_of (DataSet* self, + DataObject* object); +gint sorted_list_locate (SortedList* self, + gconstpointer search, + gboolean altered, + GEqualFunc equal_func); +gboolean data_set_add (DataSet* self, + DataObject* object); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +gboolean data_set_remove (DataSet* self, + DataObject* object); +gboolean data_set_remove_many (DataSet* self, + GeeCollection* objects); +gboolean data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration); +gboolean sorted_list_resort_item (SortedList* self, + gconstpointer item); static void data_set_finalize (DataSet * obj); -DataSet* data_set_construct (GType object_type) { +DataSet* +data_set_construct (GType object_type) +{ DataSet* self = NULL; #line 35 "/home/jens/Source/shotwell/src/core/DataSet.vala" self = (DataSet*) g_type_create_instance (object_type); @@ -173,42 +228,40 @@ DataSet* data_set_construct (GType object_type) { data_set_reset_comparator (self); #line 35 "/home/jens/Source/shotwell/src/core/DataSet.vala" return self; -#line 177 "DataSet.c" +#line 232 "DataSet.c" } -DataSet* data_set_new (void) { +DataSet* +data_set_new (void) +{ #line 35 "/home/jens/Source/shotwell/src/core/DataSet.vala" return data_set_construct (TYPE_DATA_SET); -#line 184 "DataSet.c" +#line 241 "DataSet.c" } -static gint64 data_set_order_added_comparator (DataSet* self, void* a, void* b) { +static gint64 +data_set_order_added_comparator (DataSet* self, + void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - gint64 _tmp1_; - void* _tmp2_; - gint64 _tmp3_; #line 39 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0LL); #line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = a; -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) _tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = b; -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) _tmp2_, TYPE_DATA_OBJECT, DataObject)); -#line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp1_ - _tmp3_; + result = data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) a, TYPE_DATA_OBJECT, DataObject)) - data_object_internal_get_ordinal (G_TYPE_CHECK_INSTANCE_CAST ((DataObject*) b, TYPE_DATA_OBJECT, DataObject)); #line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 208 "DataSet.c" +#line 257 "DataSet.c" } -static gboolean data_set_order_added_predicate (DataSet* self, DataObject* object, Alteration* alteration) { +static gboolean +data_set_order_added_predicate (DataSet* self, + DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; #line 43 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); @@ -220,96 +273,76 @@ static gboolean data_set_order_added_predicate (DataSet* self, DataObject* objec result = FALSE; #line 45 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 224 "DataSet.c" +#line 277 "DataSet.c" } -static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) { +static gint64 +data_set_comparator_wrapper (DataSet* self, + void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - void* _tmp1_; gint64 _result_ = 0LL; - Comparator _tmp2_; - void* _tmp2__target; - gint64 _tmp7_; - gint64 _tmp11_; + Comparator _tmp0_; + void* _tmp0__target; + gint64 _tmp2_; + gint64 _tmp3_; #line 48 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0LL); #line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = a; -#line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = b; -#line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 50 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = (gint64) 0; #line 50 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 249 "DataSet.c" +#line 300 "DataSet.c" } #line 54 "/home/jens/Source/shotwell/src/core/DataSet.vala" _result_ = (gint64) 0; #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = self->priv->user_comparator; + _tmp0_ = self->priv->user_comparator; #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2__target = self->priv->user_comparator_target; + _tmp0__target = self->priv->user_comparator_target; #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp2_ != NULL) { -#line 259 "DataSet.c" - Comparator _tmp3_; - void* _tmp3__target; - void* _tmp4_; - void* _tmp5_; - gint64 _tmp6_; -#line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->user_comparator; + if (_tmp0_ != NULL) { +#line 310 "DataSet.c" + Comparator _tmp1_; + void* _tmp1__target; #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3__target = self->priv->user_comparator_target; + _tmp1_ = self->priv->user_comparator; #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = a; + _tmp1__target = self->priv->user_comparator_target; #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = b; -#line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _result_ = _tmp6_; -#line 277 "DataSet.c" + _result_ = _tmp1_ (a, b, _tmp1__target); +#line 319 "DataSet.c" } #line 59 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = _result_; + _tmp2_ = _result_; #line 59 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp7_ == ((gint64) 0)) { -#line 283 "DataSet.c" - void* _tmp8_; - void* _tmp9_; - gint64 _tmp10_; -#line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp8_ = a; -#line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp9_ = b; -#line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp10_ = data_set_order_added_comparator (self, _tmp8_, _tmp9_); + if (_tmp2_ == ((gint64) 0)) { #line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _result_ = _tmp10_; -#line 295 "DataSet.c" + _result_ = data_set_order_added_comparator (self, a, b); +#line 327 "DataSet.c" } #line 62 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp11_ = _result_; + _tmp3_ = _result_; #line 62 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _vala_assert (_tmp11_ != ((gint64) 0), "result != 0"); + _vala_assert (_tmp3_ != ((gint64) 0), "result != 0"); #line 64 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = _result_; #line 64 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 305 "DataSet.c" +#line 337 "DataSet.c" } -gboolean data_set_contains (DataSet* self, DataObject* object) { +gboolean +data_set_contains (DataSet* self, + DataObject* object) +{ gboolean result = FALSE; GeeHashSet* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -317,54 +350,59 @@ gboolean data_set_contains (DataSet* self, DataObject* object) { #line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->hash_set; #line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp2_; + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object); #line 68 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 328 "DataSet.c" +#line 357 "DataSet.c" } -inline gint data_set_get_count (DataSet* self) { +inline gint +data_set_get_count (DataSet* self) +{ gint result = 0; SortedList* _tmp0_; - gint _tmp1_; #line 71 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0); #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = sorted_list_get_count (_tmp0_); -#line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp1_; + result = sorted_list_get_count (_tmp0_); #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 346 "DataSet.c" +#line 374 "DataSet.c" } -static gboolean _data_set_order_added_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_data_set_order_added_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = data_set_order_added_predicate ((DataSet*) self, object, alteration); #line 77 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 355 "DataSet.c" +#line 387 "DataSet.c" } -static gint64 _data_set_order_added_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_data_set_order_added_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = data_set_order_added_comparator ((DataSet*) self, a, b); #line 78 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 364 "DataSet.c" +#line 400 "DataSet.c" } -void data_set_reset_comparator (DataSet* self) { +void +data_set_reset_comparator (DataSet* self) +{ SortedList* _tmp0_; #line 75 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (IS_DATA_SET (self)); @@ -380,11 +418,14 @@ void data_set_reset_comparator (DataSet* self) { _tmp0_ = self->priv->list; #line 78 "/home/jens/Source/shotwell/src/core/DataSet.vala" sorted_list_resort (_tmp0_, _data_set_order_added_comparator_comparator, self); -#line 384 "DataSet.c" +#line 422 "DataSet.c" } -Comparator data_set_get_comparator (DataSet* self, void** result_target) { +Comparator +data_set_get_comparator (DataSet* self, + void** result_target) +{ Comparator result = NULL; Comparator _tmp0_; void* _tmp0__target; @@ -406,11 +447,14 @@ Comparator data_set_get_comparator (DataSet* self, void** result_target) { result = _tmp1_; #line 82 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 410 "DataSet.c" +#line 451 "DataSet.c" } -ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target) { +ComparatorPredicate +data_set_get_comparator_predicate (DataSet* self, + void** result_target) +{ ComparatorPredicate result = NULL; ComparatorPredicate _tmp0_; void* _tmp0__target; @@ -432,52 +476,52 @@ ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** res result = _tmp1_; #line 86 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 436 "DataSet.c" +#line 480 "DataSet.c" } -static gint64 _data_set_comparator_wrapper_comparator (void* a, void* b, gpointer self) { +static gint64 +_data_set_comparator_wrapper_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = data_set_comparator_wrapper ((DataSet*) self, a, b); #line 92 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 445 "DataSet.c" +#line 493 "DataSet.c" } -void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target) { - Comparator _tmp0_; - void* _tmp0__target; - ComparatorPredicate _tmp1_; - void* _tmp1__target; - SortedList* _tmp2_; +void +data_set_set_comparator (DataSet* self, + Comparator user_comparator, + void* user_comparator_target, + ComparatorPredicate comparator_predicate, + void* comparator_predicate_target) +{ + SortedList* _tmp0_; #line 89 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (IS_DATA_SET (self)); #line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = user_comparator; + self->priv->user_comparator = user_comparator; #line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0__target = user_comparator_target; -#line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->user_comparator = _tmp0_; -#line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->user_comparator_target = _tmp0__target; -#line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = comparator_predicate; + self->priv->user_comparator_target = user_comparator_target; #line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1__target = comparator_predicate_target; + self->priv->comparator_predicate = comparator_predicate; #line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->comparator_predicate = _tmp1_; -#line 91 "/home/jens/Source/shotwell/src/core/DataSet.vala" - self->priv->comparator_predicate_target = _tmp1__target; + self->priv->comparator_predicate_target = comparator_predicate_target; #line 92 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = self->priv->list; + _tmp0_ = self->priv->list; #line 92 "/home/jens/Source/shotwell/src/core/DataSet.vala" - sorted_list_resort (_tmp2_, _data_set_comparator_wrapper_comparator, self); -#line 477 "DataSet.c" + sorted_list_resort (_tmp0_, _data_set_comparator_wrapper_comparator, self); +#line 519 "DataSet.c" } -GeeList* data_set_get_all (DataSet* self) { +GeeList* +data_set_get_all (DataSet* self) +{ GeeList* result = NULL; SortedList* _tmp0_; GeeList* _tmp1_; @@ -494,11 +538,13 @@ GeeList* data_set_get_all (DataSet* self) { result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 498 "DataSet.c" +#line 542 "DataSet.c" } -DataSet* data_set_copy (DataSet* self) { +DataSet* +data_set_copy (DataSet* self) +{ DataSet* result = NULL; DataSet* clone = NULL; DataSet* _tmp0_; @@ -530,37 +576,38 @@ DataSet* data_set_copy (DataSet* self) { result = clone; #line 104 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 534 "DataSet.c" +#line 580 "DataSet.c" } -DataObject* data_set_get_at (DataSet* self, gint index) { +DataObject* +data_set_get_at (DataSet* self, + gint index) +{ DataObject* result = NULL; SortedList* _tmp0_; - gint _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 107 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), NULL); #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = index; + _tmp1_ = sorted_list_get_at (_tmp0_, index); #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = sorted_list_get_at (_tmp0_, _tmp1_); -#line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = (DataObject*) _tmp2_; + result = (DataObject*) _tmp1_; #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 555 "DataSet.c" +#line 601 "DataSet.c" } -gint data_set_index_of (DataSet* self, DataObject* object) { +gint +data_set_index_of (DataSet* self, + DataObject* object) +{ gint result = 0; SortedList* _tmp0_; - DataObject* _tmp1_; - GEqualFunc _tmp2_; - gint _tmp3_; + GEqualFunc _tmp1_; #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), 0); #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -568,27 +615,22 @@ gint data_set_index_of (DataSet* self, DataObject* object) { #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = g_direct_equal; -#line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = sorted_list_locate (_tmp0_, _tmp1_, FALSE, _tmp2_); + _tmp1_ = g_direct_equal; #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp3_; + result = sorted_list_locate (_tmp0_, object, FALSE, _tmp1_); #line 112 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 581 "DataSet.c" +#line 624 "DataSet.c" } -gboolean data_set_add (DataSet* self, DataObject* object) { +gboolean +data_set_add (DataSet* self, + DataObject* object) +{ gboolean result = FALSE; SortedList* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; - gboolean _tmp5_; + GeeHashSet* _tmp1_; #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -596,137 +638,110 @@ gboolean data_set_add (DataSet* self, DataObject* object) { #line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 117 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp2_) { + if (!gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), object)) { #line 118 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 118 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 609 "DataSet.c" +#line 647 "DataSet.c" } #line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->hash_set; -#line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = object; + _tmp1_ = self->priv->hash_set; #line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp5_) { -#line 619 "DataSet.c" - SortedList* _tmp6_; - DataObject* _tmp7_; -#line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = self->priv->list; + if (!gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object)) { +#line 653 "DataSet.c" + SortedList* _tmp2_; #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = object; + _tmp2_ = self->priv->list; #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), object); #line 124 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 124 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 632 "DataSet.c" +#line 663 "DataSet.c" } #line 127 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = TRUE; #line 127 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 638 "DataSet.c" +#line 669 "DataSet.c" } -gboolean data_set_add_many (DataSet* self, GeeCollection* objects) { +gboolean +data_set_add_many (DataSet* self, + GeeCollection* objects) +{ gboolean result = FALSE; gint count = 0; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; gint _tmp2_; - gint _tmp3_; - SortedList* _tmp4_; - GeeCollection* _tmp5_; - gboolean _tmp6_; - GeeHashSet* _tmp7_; - GeeCollection* _tmp8_; - gboolean _tmp9_; + SortedList* _tmp3_; + GeeHashSet* _tmp4_; #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (GEE_IS_COLLECTION (objects), FALSE); #line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = objects; -#line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (objects); #line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/DataSet.vala" - count = _tmp2_; + count = _tmp1_; #line 133 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = count; + _tmp2_ = count; #line 133 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (_tmp3_ == 0) { + if (_tmp2_ == 0) { #line 134 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = TRUE; #line 134 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 675 "DataSet.c" +#line 702 "DataSet.c" } #line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = self->priv->list; -#line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = objects; -#line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), _tmp5_); + _tmp3_ = self->priv->list; #line 136 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp6_) { + if (!gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { #line 137 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 137 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 689 "DataSet.c" +#line 712 "DataSet.c" } #line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = self->priv->hash_set; -#line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp8_ = objects; -#line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp9_ = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); + _tmp4_ = self->priv->hash_set; #line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp9_) { -#line 699 "DataSet.c" - SortedList* _tmp10_; - GeeCollection* _tmp11_; -#line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp10_ = self->priv->list; + if (!gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { +#line 718 "DataSet.c" + SortedList* _tmp5_; #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp11_ = objects; + _tmp5_ = self->priv->list; #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), objects); #line 143 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = FALSE; #line 143 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 712 "DataSet.c" +#line 728 "DataSet.c" } #line 146 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = TRUE; #line 146 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 718 "DataSet.c" +#line 734 "DataSet.c" } -gboolean data_set_remove (DataSet* self, DataObject* object) { +gboolean +data_set_remove (DataSet* self, + DataObject* object) +{ gboolean result = FALSE; gboolean success = FALSE; SortedList* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - DataObject* _tmp4_; - gboolean _tmp5_; + GeeHashSet* _tmp1_; #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -736,44 +751,35 @@ gboolean data_set_remove (DataSet* self, DataObject* object) { #line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = object; -#line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 152 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp2_) { + if (!gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), object)) { #line 153 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 747 "DataSet.c" +#line 758 "DataSet.c" } #line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->hash_set; -#line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = object; + _tmp1_ = self->priv->hash_set; #line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); -#line 155 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp5_) { + if (!gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), object)) { #line 156 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 759 "DataSet.c" +#line 766 "DataSet.c" } #line 158 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = success; #line 158 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 765 "DataSet.c" +#line 772 "DataSet.c" } -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects) { +gboolean +data_set_remove_many (DataSet* self, + GeeCollection* objects) +{ gboolean result = FALSE; gboolean success = FALSE; SortedList* _tmp0_; - GeeCollection* _tmp1_; - gboolean _tmp2_; - GeeHashSet* _tmp3_; - GeeCollection* _tmp4_; - gboolean _tmp5_; + GeeHashSet* _tmp1_; #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -783,44 +789,38 @@ gboolean data_set_remove_many (DataSet* self, GeeCollection* objects) { #line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = self->priv->list; #line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = objects; -#line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp2_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 164 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp2_) { + if (!gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { #line 165 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 794 "DataSet.c" +#line 796 "DataSet.c" } #line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = self->priv->hash_set; -#line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = objects; + _tmp1_ = self->priv->hash_set; #line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); -#line 167 "/home/jens/Source/shotwell/src/core/DataSet.vala" - if (!_tmp5_) { + if (!gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), objects)) { #line 168 "/home/jens/Source/shotwell/src/core/DataSet.vala" success = FALSE; -#line 806 "DataSet.c" +#line 804 "DataSet.c" } #line 170 "/home/jens/Source/shotwell/src/core/DataSet.vala" result = success; #line 170 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 812 "DataSet.c" +#line 810 "DataSet.c" } -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration) { +gboolean +data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; ComparatorPredicate _tmp2_; void* _tmp2__target; - SortedList* _tmp8_; - DataObject* _tmp9_; - gboolean _tmp10_; + SortedList* _tmp4_; #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), FALSE); #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -833,43 +833,30 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* _tmp2__target = self->priv->comparator_predicate_target; #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp2_ != NULL) { -#line 837 "DataSet.c" - Alteration* _tmp3_; -#line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp3_ = alteration; #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp1_ = _tmp3_ != NULL; -#line 843 "DataSet.c" + _tmp1_ = alteration != NULL; +#line 839 "DataSet.c" } else { #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp1_ = FALSE; -#line 847 "DataSet.c" +#line 843 "DataSet.c" } #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp1_) { -#line 851 "DataSet.c" - ComparatorPredicate _tmp4_; - void* _tmp4__target; - DataObject* _tmp5_; - Alteration* _tmp6_; - gboolean _tmp7_; -#line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4_ = self->priv->comparator_predicate; -#line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp4__target = self->priv->comparator_predicate_target; -#line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp5_ = object; +#line 847 "DataSet.c" + ComparatorPredicate _tmp3_; + void* _tmp3__target; #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp6_ = alteration; + _tmp3_ = self->priv->comparator_predicate; #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp7_ = _tmp4_ (_tmp5_, _tmp6_, _tmp4__target); + _tmp3__target = self->priv->comparator_predicate_target; #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp0_ = !_tmp7_; -#line 869 "DataSet.c" + _tmp0_ = !_tmp3_ (object, alteration, _tmp3__target); +#line 856 "DataSet.c" } else { #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp0_ = FALSE; -#line 873 "DataSet.c" +#line 860 "DataSet.c" } #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp0_) { @@ -877,120 +864,141 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* result = FALSE; #line 177 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 881 "DataSet.c" +#line 868 "DataSet.c" } #line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp8_ = self->priv->list; -#line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp9_ = object; -#line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - _tmp10_ = sorted_list_resort_item (_tmp8_, _tmp9_); + _tmp4_ = self->priv->list; #line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" - result = _tmp10_; + result = sorted_list_resort_item (_tmp4_, object); #line 180 "/home/jens/Source/shotwell/src/core/DataSet.vala" return result; -#line 893 "DataSet.c" +#line 876 "DataSet.c" } -static void value_data_set_init (GValue* value) { +static void +value_data_set_init (GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 900 "DataSet.c" +#line 885 "DataSet.c" } -static void value_data_set_free_value (GValue* value) { +static void +value_data_set_free_value (GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (value->data[0].v_pointer) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_unref (value->data[0].v_pointer); -#line 909 "DataSet.c" +#line 896 "DataSet.c" } } -static void value_data_set_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_data_set_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (src_value->data[0].v_pointer) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" dest_value->data[0].v_pointer = data_set_ref (src_value->data[0].v_pointer); -#line 919 "DataSet.c" +#line 909 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" dest_value->data[0].v_pointer = NULL; -#line 923 "DataSet.c" +#line 913 "DataSet.c" } } -static gpointer value_data_set_peek_pointer (const GValue* value) { +static gpointer +value_data_set_peek_pointer (const GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return value->data[0].v_pointer; -#line 931 "DataSet.c" +#line 923 "DataSet.c" } -static gchar* value_data_set_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_set_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (collect_values[0].v_pointer) { -#line 938 "DataSet.c" +#line 935 "DataSet.c" DataSet * object; object = collect_values[0].v_pointer; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (object->parent_instance.g_class == NULL) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 945 "DataSet.c" +#line 942 "DataSet.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.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 949 "DataSet.c" +#line 946 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = data_set_ref (object); -#line 953 "DataSet.c" +#line 950 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 957 "DataSet.c" +#line 954 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return NULL; -#line 961 "DataSet.c" +#line 958 "DataSet.c" } -static gchar* value_data_set_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_data_set_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DataSet ** object_p; object_p = collect_values[0].v_pointer; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (!object_p) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 972 "DataSet.c" +#line 974 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (!value->data[0].v_pointer) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" *object_p = NULL; -#line 978 "DataSet.c" +#line 980 "DataSet.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" *object_p = value->data[0].v_pointer; -#line 982 "DataSet.c" +#line 984 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" *object_p = data_set_ref (value->data[0].v_pointer); -#line 986 "DataSet.c" +#line 988 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return NULL; -#line 990 "DataSet.c" +#line 992 "DataSet.c" } -GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_data_set (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDataSet* spec; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DATA_SET), NULL); @@ -1000,20 +1008,25 @@ GParamSpec* param_spec_data_set (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return G_PARAM_SPEC (spec); -#line 1004 "DataSet.c" +#line 1012 "DataSet.c" } -gpointer value_get_data_set (const GValue* value) { +gpointer +value_get_data_set (const GValue* value) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET), NULL); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return value->data[0].v_pointer; -#line 1013 "DataSet.c" +#line 1023 "DataSet.c" } -void value_set_data_set (GValue* value, gpointer v_object) { +void +value_set_data_set (GValue* value, + gpointer v_object) +{ DataSet * old; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET)); @@ -1029,22 +1042,25 @@ void value_set_data_set (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_ref (value->data[0].v_pointer); -#line 1033 "DataSet.c" +#line 1046 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 1037 "DataSet.c" +#line 1050 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (old) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_unref (old); -#line 1043 "DataSet.c" +#line 1056 "DataSet.c" } } -void value_take_data_set (GValue* value, gpointer v_object) { +void +value_take_data_set (GValue* value, + gpointer v_object) +{ DataSet * old; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET)); @@ -1058,33 +1074,37 @@ void value_take_data_set (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = v_object; -#line 1062 "DataSet.c" +#line 1078 "DataSet.c" } else { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" value->data[0].v_pointer = NULL; -#line 1066 "DataSet.c" +#line 1082 "DataSet.c" } #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (old) { #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_unref (old); -#line 1072 "DataSet.c" +#line 1088 "DataSet.c" } } -static void data_set_class_init (DataSetClass * klass) { +static void +data_set_class_init (DataSetClass * klass) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" data_set_parent_class = g_type_class_peek_parent (klass); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" ((DataSetClass *) klass)->finalize = data_set_finalize; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_type_class_add_private (klass, sizeof (DataSetPrivate)); -#line 1084 "DataSet.c" +#line 1102 "DataSet.c" } -static void data_set_instance_init (DataSet * self) { +static void +data_set_instance_init (DataSet * self) +{ SortedList* _tmp0_; GeeHashSet* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -1107,11 +1127,13 @@ static void data_set_instance_init (DataSet * self) { self->priv->comparator_predicate_target = self; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" self->ref_count = 1; -#line 1111 "DataSet.c" +#line 1131 "DataSet.c" } -static void data_set_finalize (DataSet * obj) { +static void +data_set_finalize (DataSet * obj) +{ DataSet * self; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SET, DataSet); @@ -1121,11 +1143,13 @@ static void data_set_finalize (DataSet * obj) { _g_object_unref0 (self->priv->list); #line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala" _g_object_unref0 (self->priv->hash_set); -#line 1125 "DataSet.c" +#line 1147 "DataSet.c" } -GType data_set_get_type (void) { +GType +data_set_get_type (void) +{ static volatile gsize data_set_type_id__volatile = 0; if (g_once_init_enter (&data_set_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_data_set_init, value_data_set_free_value, value_data_set_copy_value, value_data_set_peek_pointer, "p", value_data_set_collect_value, "p", value_data_set_lcopy_value }; @@ -1139,18 +1163,22 @@ GType data_set_get_type (void) { } -gpointer data_set_ref (gpointer instance) { +gpointer +data_set_ref (gpointer instance) +{ DataSet * self; self = instance; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_atomic_int_inc (&self->ref_count); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" return instance; -#line 1150 "DataSet.c" +#line 1176 "DataSet.c" } -void data_set_unref (gpointer instance) { +void +data_set_unref (gpointer instance) +{ DataSet * self; self = instance; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -1159,7 +1187,7 @@ void data_set_unref (gpointer instance) { DATA_SET_GET_CLASS (self)->finalize (self); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1163 "DataSet.c" +#line 1191 "DataSet.c" } } diff --git a/src/core/DataSource.c b/src/core/DataSource.c index dab0d7b..3d7ecf5 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -1,4 +1,4 @@ -/* DataSource.c generated by valac 0.36.6, the Vala compiler +/* DataSource.c generated by valac 0.40.4, the Vala compiler * generated from DataSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -37,6 +37,7 @@ /* track when changes to external state would break the proxy and call notify_broken();*/ /**/ + #include #include #include @@ -126,6 +127,11 @@ typedef struct _SourceSnapshotClass SourceSnapshotClass; typedef struct _DataView DataView; typedef struct _DataViewClass DataViewClass; +enum { + DATA_SOURCE_0_PROPERTY, + DATA_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* data_source_properties[DATA_SOURCE_NUM_PROPERTIES]; #define _source_holding_tank_unref0(var) ((var == NULL) ? NULL : (var = (source_holding_tank_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) @@ -147,16 +153,16 @@ enum { DATA_SOURCE_UNLINKED_SIGNAL, DATA_SOURCE_RELINKED_SIGNAL, DATA_SOURCE_DESTROYED_SIGNAL, - DATA_SOURCE_LAST_SIGNAL + DATA_SOURCE_NUM_SIGNALS }; -static guint data_source_signals[DATA_SOURCE_LAST_SIGNAL] = {0}; +static guint data_source_signals[DATA_SOURCE_NUM_SIGNALS] = {0}; typedef struct _SourceSnapshotPrivate SourceSnapshotPrivate; typedef struct _ParamSpecSourceSnapshot ParamSpecSourceSnapshot; enum { SOURCE_SNAPSHOT_BROKEN_SIGNAL, - SOURCE_SNAPSHOT_LAST_SIGNAL + SOURCE_SNAPSHOT_NUM_SIGNALS }; -static guint source_snapshot_signals[SOURCE_SNAPSHOT_LAST_SIGNAL] = {0}; +static guint source_snapshot_signals[SOURCE_SNAPSHOT_NUM_SIGNALS] = {0}; typedef struct _SourceBacklinkPrivate SourceBacklinkPrivate; typedef struct _ParamSpecSourceBacklink ParamSpecSourceBacklink; @@ -176,9 +182,9 @@ enum { SOURCE_PROXY_RECONSTITUTED_SIGNAL, SOURCE_PROXY_DEHYDRATED_SIGNAL, SOURCE_PROXY_BROKEN_SIGNAL, - SOURCE_PROXY_LAST_SIGNAL + SOURCE_PROXY_NUM_SIGNALS }; -static guint source_proxy_signals[SOURCE_PROXY_LAST_SIGNAL] = {0}; +static guint source_proxy_signals[SOURCE_PROXY_NUM_SIGNALS] = {0}; #define TYPE_PROXYABLE (proxyable_get_type ()) #define PROXYABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROXYABLE, Proxyable)) @@ -331,58 +337,96 @@ static gpointer source_proxy_parent_class = NULL; 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; 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_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; #define DATA_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_SOURCE, DataSourcePrivate)) -enum { - DATA_SOURCE_DUMMY_PROPERTY -}; -DataSource* data_source_construct (GType object_type, gint64 object_id); -DataObject* data_object_construct (GType object_type, gint64 object_id); -static void data_source_real_notify_membership_changed (DataObject* base, DataCollection* collection); +DataSource* data_source_construct (GType object_type, + gint64 object_id); +DataObject* data_object_construct (GType object_type, + gint64 object_id); +static void data_source_real_notify_membership_changed (DataObject* base, + DataCollection* collection); void data_source_notify_unlinked (DataSource* self); -void data_object_notify_membership_changed (DataObject* self, DataCollection* collection); -void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank); -static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank); +void data_object_notify_membership_changed (DataObject* self, + DataCollection* collection); +void data_source_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank); +static void data_source_real_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank); DataCollection* data_object_get_membership (DataObject* self); -static void data_source_real_notify_altered (DataObject* base, Alteration* alteration); -void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration); -void data_source_contact_subscribers_alteration (DataSource* self, Alteration* alteration); -void data_object_notify_altered (DataObject* self, Alteration* alteration); -void data_source_notify_unlinking (DataSource* self, SourceCollection* collection); -static void data_source_real_notify_unlinking (DataSource* self, SourceCollection* collection); +static void data_source_real_notify_altered (DataObject* base, + Alteration* alteration); +void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, + DataSource* source, + Alteration* alteration); +void data_source_contact_subscribers_alteration (DataSource* self, + Alteration* alteration); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); +void data_source_notify_unlinking (DataSource* self, + SourceCollection* collection); +static void data_source_real_notify_unlinking (DataSource* self, + SourceCollection* collection); static void data_source_real_notify_unlinked (DataSource* self); -void data_source_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated); +void data_source_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated); static gchar* data_source_dehydrate_backlinks (DataSource* self); -void data_source_notify_relinking (DataSource* self, SourceCollection* collection); -static void data_source_real_notify_relinking (DataSource* self, SourceCollection* collection); +void data_source_notify_relinking (DataSource* self, + SourceCollection* collection); +static void data_source_real_notify_relinking (DataSource* self, + SourceCollection* collection); void data_source_notify_relinked (DataSource* self); static void data_source_real_notify_relinked (DataSource* self); gchar* data_source_get_typename (DataSource* self); @@ -393,50 +437,89 @@ gchar* data_source_get_source_id (DataSource* self); static gchar* data_source_real_get_source_id (DataSource* self); gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; -gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink); +gboolean data_source_has_backlink (DataSource* self, + SourceBacklink* backlink); const gchar* source_backlink_get_name (SourceBacklink* self); const gchar* source_backlink_get_value (SourceBacklink* self); -GeeList* data_source_get_backlinks (DataSource* self, const gchar* name); -SourceBacklink* source_backlink_new (const gchar* name, const gchar* value); -SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, const gchar* value); -void data_source_set_backlink (DataSource* self, SourceBacklink* backlink); -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink); -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink); -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink); -static void data_source_real_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated); +GeeList* data_source_get_backlinks (DataSource* self, + const gchar* name); +SourceBacklink* source_backlink_new (const gchar* name, + const gchar* value); +SourceBacklink* source_backlink_construct (GType object_type, + const gchar* name, + const gchar* value); +void data_source_set_backlink (DataSource* self, + SourceBacklink* backlink); +void source_collection_internal_backlink_set (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); +gboolean data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink); +void source_collection_internal_backlink_removed (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); +static void data_source_real_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated); gchar* data_object_to_string (DataObject* self); gboolean is_string_empty (const gchar* s); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); SourceSnapshot* data_source_save_snapshot (DataSource* self); static SourceSnapshot* data_source_real_save_snapshot (DataSource* self); void data_source_internal_mark_for_destroy (DataSource* self); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); -static gboolean data_source_real_internal_delete_backing (DataSource* self, GError** error); -gboolean data_source_equals (DataSource* self, DataSource* source); -static gboolean data_source_real_equals (DataSource* self, DataSource* source); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); +static gboolean data_source_real_internal_delete_backing (DataSource* self, + GError** error); +gboolean data_source_equals (DataSource* self, + DataSource* source); +static gboolean data_source_real_equals (DataSource* self, + DataSource* source); void data_source_destroy (DataSource* self); static void data_source_real_destroy (DataSource* self); -void data_view_notify_unsubscribed (DataView* self, DataSource* source); -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -void data_source_internal_subscribe (DataSource* self, DataView* view); -static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value); -void data_source_internal_unsubscribe (DataSource* self, DataView* view); -void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target); -static void data_source_real_unlinked (DataSource* self, SourceCollection* sources); -static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void data_source_real_relinked (DataSource* self, SourceCollection* sources); +void data_view_notify_unsubscribed (DataView* self, + DataSource* source); +gboolean data_source_destroy_orphan (DataSource* self, + gboolean delete_backing); +void source_collection_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked); +void data_source_internal_subscribe (DataSource* self, + DataView* view); +static void _vala_array_add66 (DataView** * array, + int* length, + int* size, + DataView* value); +void data_source_internal_unsubscribe (DataSource* self, + DataView* view); +void data_source_contact_subscribers (DataSource* self, + DataSourceContactSubscriber contact_subscriber, + void* contact_subscriber_target); +static void data_source_real_unlinked (DataSource* self, + SourceCollection* sources); +static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void data_source_real_relinked (DataSource* self, + SourceCollection* sources); static void data_source_real_destroyed (DataSource* self); static void data_source_finalize (GObject * obj); #define SOURCE_SNAPSHOT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_SNAPSHOT, SourceSnapshotPrivate)) -enum { - SOURCE_SNAPSHOT_DUMMY_PROPERTY -}; void source_snapshot_notify_broken (SourceSnapshot* self); static void source_snapshot_real_notify_broken (SourceSnapshot* self); gboolean source_snapshot_is_broken (SourceSnapshot* self); @@ -444,159 +527,178 @@ SourceSnapshot* source_snapshot_construct (GType object_type); static void source_snapshot_real_broken (SourceSnapshot* self); static void source_snapshot_finalize (SourceSnapshot * obj); #define SOURCE_BACKLINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_BACKLINK, SourceBacklinkPrivate)) -enum { - SOURCE_BACKLINK_DUMMY_PROPERTY -}; -static gboolean source_backlink_validate_name_value (const gchar* name, const gchar* value); +static gboolean source_backlink_validate_name_value (const gchar* name, + const gchar* value); SourceBacklink* source_backlink_new_from_source (DataSource* source); -SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source); +SourceBacklink* source_backlink_construct_from_source (GType object_type, + DataSource* source); gchar* source_backlink_to_string (SourceBacklink* self); guint source_backlink_hash_func (SourceBacklink* backlink); -gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink); +gboolean source_backlink_equal_func (SourceBacklink* alink, + SourceBacklink* blink); const gchar* source_backlink_get_typename (SourceBacklink* self); gint64 source_backlink_get_instance_id (SourceBacklink* self); static void source_backlink_finalize (SourceBacklink * obj); gpointer source_proxy_ref (gpointer instance); void source_proxy_unref (gpointer instance); -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_proxy (GValue* value, gpointer v_object); -void value_take_source_proxy (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_proxy (GValue* value, + gpointer v_object); +void value_take_source_proxy (GValue* value, + gpointer v_object); gpointer value_get_source_proxy (const GValue* value); GType source_proxy_get_type (void) G_GNUC_CONST; #define SOURCE_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_PROXY, SourceProxyPrivate)) -enum { - SOURCE_PROXY_DUMMY_PROPERTY -}; static void source_proxy_drop_source (SourceProxy* self); -static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added); -static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -SourceProxy* source_proxy_construct (GType object_type, DataSource* source); +static void source_proxy_on_source_added (SourceProxy* self, + GeeIterable* added); +static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +SourceProxy* source_proxy_construct (GType object_type, + DataSource* source); gint64 data_object_get_object_id (DataObject* self); static void source_proxy_on_snapshot_broken (SourceProxy* self); -static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, gpointer self); -static void source_proxy_set_source (SourceProxy* self, DataSource* source); -DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot); -static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot); -void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source); -static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSource* source); +static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, + gpointer self); +static void source_proxy_set_source (SourceProxy* self, + DataSource* source); +DataSource* source_proxy_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot); +static DataSource* source_proxy_real_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot); +void source_proxy_notify_reconstituted (SourceProxy* self, + DataSource* source); +static void source_proxy_real_notify_reconstituted (SourceProxy* self, + DataSource* source); void source_proxy_notify_dehydrated (SourceProxy* self); static void source_proxy_real_notify_dehydrated (SourceProxy* self); void source_proxy_notify_broken (SourceProxy* self); static void source_proxy_real_notify_broken (SourceProxy* self); static void source_proxy_on_destroyed (SourceProxy* self); -static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, gpointer self); +static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self); DataSource* source_proxy_get_source (SourceProxy* self); -gboolean data_collection_contains (DataCollection* self, DataObject* object); -static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); +static void source_proxy_real_reconstituted (SourceProxy* self, + DataSource* source); static void source_proxy_real_dehydrated (SourceProxy* self); static void source_proxy_real_broken (SourceProxy* self); static void source_proxy_finalize (SourceProxy * obj); GType proxyable_get_type (void) G_GNUC_CONST; SourceProxy* proxyable_get_proxy (Proxyable* self); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); -DataSource* data_source_construct (GType object_type, gint64 object_id) { +DataSource* +data_source_construct (GType object_type, + gint64 object_id) +{ DataSource * self = NULL; - gint64 _tmp0_; -#line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = object_id; #line 64 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self = (DataSource*) data_object_construct (object_type, _tmp0_); + self = (DataSource*) data_object_construct (object_type, object_id); #line 63 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 511 "DataSource.c" +#line 616 "DataSource.c" } -static void data_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) { +static void +data_source_real_notify_membership_changed (DataObject* base, + DataCollection* collection) +{ DataSource * self; - DataCollection* _tmp0_; - gboolean _tmp5_ = FALSE; - DataCollection* _tmp6_; - DataCollection* _tmp8_; + gboolean _tmp4_ = FALSE; #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_SOURCE, DataSource); #line 73 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection)); #line 75 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = collection; -#line 75 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp0_ == NULL) { -#line 529 "DataSource.c" - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; + if (collection == NULL) { +#line 632 "DataSource.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = self->priv->is_destroyed; + _tmp1_ = self->priv->is_destroyed; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_) { + if (_tmp1_) { #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = TRUE; -#line 538 "DataSource.c" + _tmp0_ = TRUE; +#line 641 "DataSource.c" } else { - GeeHashMap* _tmp3_; + GeeHashMap* _tmp2_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = self->priv->backlinks; + _tmp2_ = self->priv->backlinks; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = _tmp3_ != NULL; -#line 545 "DataSource.c" + _tmp0_ = _tmp2_ != NULL; +#line 648 "DataSource.c" } #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp1_, "is_destroyed || backlinks != null"); -#line 549 "DataSource.c" + _vala_assert (_tmp0_, "is_destroyed || backlinks != null"); +#line 652 "DataSource.c" } else { - gboolean _tmp4_; + gboolean _tmp3_; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = self->priv->is_destroyed; + _tmp3_ = self->priv->is_destroyed; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (!_tmp4_, "!is_destroyed"); -#line 556 "DataSource.c" + _vala_assert (!_tmp3_, "!is_destroyed"); +#line 659 "DataSource.c" } #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = collection; -#line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_ == NULL) { -#line 562 "DataSource.c" - GeeHashMap* _tmp7_; + if (collection == NULL) { +#line 663 "DataSource.c" + GeeHashMap* _tmp5_; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = self->priv->backlinks; + _tmp5_ = self->priv->backlinks; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp7_ != NULL; -#line 568 "DataSource.c" + _tmp4_ = _tmp5_ != NULL; +#line 669 "DataSource.c" } else { #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = FALSE; -#line 572 "DataSource.c" + _tmp4_ = FALSE; +#line 673 "DataSource.c" } #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp5_) { + if (_tmp4_) { #line 83 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_notify_unlinked (self); -#line 578 "DataSource.c" +#line 679 "DataSource.c" } #line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = collection; -#line 85 "/home/jens/Source/shotwell/src/core/DataSource.vala" - DATA_OBJECT_CLASS (data_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp8_); -#line 584 "DataSource.c" + DATA_OBJECT_CLASS (data_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), collection); +#line 683 "DataSource.c" } -static gpointer _source_holding_tank_ref0 (gpointer self) { +static gpointer +_source_holding_tank_ref0 (gpointer self) +{ #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? source_holding_tank_ref (self) : NULL; -#line 591 "DataSource.c" +#line 692 "DataSource.c" } -static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank) { +static void +data_source_real_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank) +{ DataCollection* _tmp0_; DataCollection* _tmp1_; - SourceHoldingTank* _tmp2_; - SourceHoldingTank* _tmp5_; - SourceHoldingTank* _tmp6_; + SourceHoldingTank* _tmp4_; #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((holding_tank == NULL) || IS_SOURCE_HOLDING_TANK (holding_tank)); #line 90 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -608,46 +710,48 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin #line 90 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (_tmp1_); #line 94 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = holding_tank; -#line 94 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_ != NULL) { -#line 615 "DataSource.c" - SourceHoldingTank* _tmp3_; + if (holding_tank != NULL) { +#line 715 "DataSource.c" + SourceHoldingTank* _tmp2_; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = self->priv->holding_tank; + _tmp2_ = self->priv->holding_tank; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp3_ == NULL, "this.holding_tank == null"); -#line 621 "DataSource.c" + _vala_assert (_tmp2_ == NULL, "this.holding_tank == null"); +#line 721 "DataSource.c" } else { - SourceHoldingTank* _tmp4_; + SourceHoldingTank* _tmp3_; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = self->priv->holding_tank; + _tmp3_ = self->priv->holding_tank; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp4_ != NULL, "this.holding_tank != null"); -#line 628 "DataSource.c" + _vala_assert (_tmp3_ != NULL, "this.holding_tank != null"); +#line 728 "DataSource.c" } #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = holding_tank; -#line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _source_holding_tank_ref0 (_tmp5_); + _tmp4_ = _source_holding_tank_ref0 (holding_tank); #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" _source_holding_tank_unref0 (self->priv->holding_tank); #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->holding_tank = _tmp6_; -#line 638 "DataSource.c" + self->priv->holding_tank = _tmp4_; +#line 736 "DataSource.c" } -void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank) { +void +data_source_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank) +{ #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 88 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_held_in_tank (self, holding_tank); -#line 647 "DataSource.c" +#line 748 "DataSource.c" } -static void data_source_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +data_source_real_notify_altered (DataObject* base, + Alteration* alteration) +{ DataSource * self; SourceHoldingTank* _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -658,81 +762,77 @@ static void data_source_real_notify_altered (DataObject* base, Alteration* alter _tmp0_ = self->priv->holding_tank; #line 105 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_ != NULL) { -#line 662 "DataSource.c" +#line 766 "DataSource.c" SourceHoldingTank* _tmp1_; - Alteration* _tmp2_; #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->holding_tank; #line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = alteration; -#line 106 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_holding_tank_internal_notify_altered (_tmp1_, self, _tmp2_); -#line 671 "DataSource.c" + source_holding_tank_internal_notify_altered (_tmp1_, self, alteration); +#line 772 "DataSource.c" } else { - Alteration* _tmp3_; - Alteration* _tmp4_; #line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = alteration; -#line 108 "/home/jens/Source/shotwell/src/core/DataSource.vala" - data_source_contact_subscribers_alteration (self, _tmp3_); -#line 110 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = alteration; + data_source_contact_subscribers_alteration (self, alteration); #line 110 "/home/jens/Source/shotwell/src/core/DataSource.vala" - DATA_OBJECT_CLASS (data_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp4_); -#line 683 "DataSource.c" + DATA_OBJECT_CLASS (data_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), alteration); +#line 778 "DataSource.c" } } -static void data_source_real_notify_unlinking (DataSource* self, SourceCollection* collection) { +static void +data_source_real_notify_unlinking (DataSource* self, + SourceCollection* collection) +{ gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; - SourceCollection* _tmp3_; - GeeHashMap* _tmp4_; + GeeHashMap* _tmp3_; #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (collection)); #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ == NULL) { -#line 699 "DataSource.c" +#line 796 "DataSource.c" SourceCollection* _tmp2_; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ == NULL; -#line 705 "DataSource.c" +#line 802 "DataSource.c" } else { #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 709 "DataSource.c" +#line 806 "DataSource.c" } #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks == null && unlinked_from_collection == null"); #line 118 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = collection; -#line 118 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->unlinked_from_collection = _tmp3_; + self->priv->unlinked_from_collection = collection; #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->backlinks); #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->backlinks = _tmp4_; -#line 723 "DataSource.c" + self->priv->backlinks = _tmp3_; +#line 818 "DataSource.c" } -void data_source_notify_unlinking (DataSource* self, SourceCollection* collection) { +void +data_source_notify_unlinking (DataSource* self, + SourceCollection* collection) +{ #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 115 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_unlinking (self, collection); -#line 732 "DataSource.c" +#line 830 "DataSource.c" } -static void data_source_real_notify_unlinked (DataSource* self) { +static void +data_source_real_notify_unlinked (DataSource* self) +{ gboolean _tmp0_ = FALSE; SourceCollection* _tmp1_; SourceCollection* _tmp3_; @@ -743,17 +843,17 @@ static void data_source_real_notify_unlinked (DataSource* self) { _tmp1_ = self->priv->unlinked_from_collection; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 747 "DataSource.c" +#line 847 "DataSource.c" GeeHashMap* _tmp2_; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->backlinks; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ != NULL; -#line 753 "DataSource.c" +#line 853 "DataSource.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 757 "DataSource.c" +#line 857 "DataSource.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "unlinked_from_collection != null && backlinks != null"); @@ -769,7 +869,7 @@ static void data_source_real_notify_unlinked (DataSource* self) { _tmp6_ = _tmp5_; #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_ > 0) { -#line 773 "DataSource.c" +#line 873 "DataSource.c" SourceCollection* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; @@ -783,21 +883,26 @@ static void data_source_real_notify_unlinked (DataSource* self) { data_source_commit_backlinks (self, _tmp7_, _tmp9_); #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp9_); -#line 787 "DataSource.c" +#line 887 "DataSource.c" } } -void data_source_notify_unlinked (DataSource* self) { +void +data_source_notify_unlinked (DataSource* self) +{ #line 123 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 123 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_unlinked (self); -#line 797 "DataSource.c" +#line 899 "DataSource.c" } -static void data_source_real_notify_relinking (DataSource* self, SourceCollection* collection) { +static void +data_source_real_notify_relinking (DataSource* self, + SourceCollection* collection) +{ gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -806,44 +911,48 @@ static void data_source_real_notify_relinking (DataSource* self, SourceCollectio _tmp1_ = self->priv->backlinks; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 810 "DataSource.c" +#line 915 "DataSource.c" SourceCollection* _tmp2_; - SourceCollection* _tmp3_; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = collection; -#line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = _tmp2_ == _tmp3_; -#line 819 "DataSource.c" + _tmp0_ = _tmp2_ == collection; +#line 921 "DataSource.c" } else { #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 823 "DataSource.c" +#line 925 "DataSource.c" } #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "(backlinks != null) && (unlinked_from_collection == collection)"); -#line 827 "DataSource.c" +#line 929 "DataSource.c" } -void data_source_notify_relinking (DataSource* self, SourceCollection* collection) { +void +data_source_notify_relinking (DataSource* self, + SourceCollection* collection) +{ #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_relinking (self, collection); -#line 836 "DataSource.c" +#line 941 "DataSource.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 142 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? data_collection_ref (self) : NULL; -#line 843 "DataSource.c" +#line 950 "DataSource.c" } -static void data_source_real_notify_relinked (DataSource* self) { +static void +data_source_real_notify_relinked (DataSource* self) +{ gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; SourceCollection* relinked_to = NULL; @@ -853,17 +962,17 @@ static void data_source_real_notify_relinked (DataSource* self) { _tmp1_ = self->priv->backlinks; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 857 "DataSource.c" +#line 966 "DataSource.c" SourceCollection* _tmp2_; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->unlinked_from_collection; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp2_ != NULL; -#line 863 "DataSource.c" +#line 972 "DataSource.c" } else { #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 867 "DataSource.c" +#line 976 "DataSource.c" } #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks != null && unlinked_from_collection != null"); @@ -885,103 +994,116 @@ static void data_source_real_notify_relinked (DataSource* self) { data_source_commit_backlinks (self, NULL, NULL); #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (relinked_to); -#line 889 "DataSource.c" +#line 998 "DataSource.c" } -void data_source_notify_relinked (DataSource* self) { +void +data_source_notify_relinked (DataSource* self) +{ #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->notify_relinked (self); -#line 898 "DataSource.c" +#line 1009 "DataSource.c" } -static gchar* data_source_real_get_typename (DataSource* self) { +static gchar* +data_source_real_get_typename (DataSource* self) +{ #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("Type `%s' does not implement abstract method `data_source_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 907 "DataSource.c" +#line 1020 "DataSource.c" } -gchar* data_source_get_typename (DataSource* self) { +gchar* +data_source_get_typename (DataSource* self) +{ #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 156 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_typename (self); -#line 916 "DataSource.c" +#line 1031 "DataSource.c" } -static gint64 data_source_real_get_instance_id (DataSource* self) { +static gint64 +data_source_real_get_instance_id (DataSource* self) +{ gint64 _tmp0_ = 0LL; #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("Type `%s' does not implement abstract method `data_source_get_instance_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" return _tmp0_; -#line 926 "DataSource.c" +#line 1043 "DataSource.c" } -gint64 data_source_get_instance_id (DataSource* self) { +gint64 +data_source_get_instance_id (DataSource* self) +{ #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), 0LL); #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_instance_id (self); -#line 935 "DataSource.c" +#line 1054 "DataSource.c" } -static gchar* data_source_real_get_source_id (DataSource* self) { +static gchar* +data_source_real_get_source_id (DataSource* self) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; - gint64 _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = data_source_get_typename (self); #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = _tmp0_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = data_source_get_instance_id (self); + _tmp2_ = g_strdup_printf ("%s-%016" G_GINT64_MODIFIER "x", _tmp1_, data_source_get_instance_id (self)); #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = g_strdup_printf ("%s-%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_); -#line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp1_); #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp4_; + result = _tmp3_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 962 "DataSource.c" +#line 1080 "DataSource.c" } -gchar* data_source_get_source_id (DataSource* self) { +gchar* +data_source_get_source_id (DataSource* self) +{ #line 166 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 166 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->get_source_id (self); -#line 971 "DataSource.c" +#line 1091 "DataSource.c" } -gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { +gboolean +data_source_has_backlink (DataSource* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - GeeList* _tmp7_; + gpointer _tmp4_; + gboolean _tmp5_ = FALSE; + GeeList* _tmp6_; #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 170 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -994,76 +1116,72 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { result = FALSE; #line 172 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 998 "DataSource.c" +#line 1120 "DataSource.c" } #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = backlink; -#line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = source_backlink_get_name (_tmp2_); + _tmp2_ = source_backlink_get_name (backlink); #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp5_; -#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = values; + values = (GeeList*) _tmp4_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp7_ != NULL) { -#line 1016 "DataSource.c" - GeeList* _tmp8_; - SourceBacklink* _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; -#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = values; + _tmp6_ = values; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = backlink; + if (_tmp6_ != NULL) { +#line 1136 "DataSource.c" + GeeList* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = source_backlink_get_value (_tmp9_); + _tmp7_ = values; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp10_; + _tmp8_ = source_backlink_get_value (backlink); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); + _tmp9_ = _tmp8_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _tmp12_; -#line 1034 "DataSource.c" + _tmp5_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_); +#line 1148 "DataSource.c" } else { #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = FALSE; -#line 1038 "DataSource.c" + _tmp5_ = FALSE; +#line 1152 "DataSource.c" } #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp6_; + result = _tmp5_; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1046 "DataSource.c" +#line 1160 "DataSource.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self ? g_object_ref (self) : NULL; -#line 1053 "DataSource.c" +#line 1169 "DataSource.c" } -GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { +GeeList* +data_source_get_backlinks (DataSource* self, + const gchar* name) +{ GeeList* result = NULL; GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - const gchar* _tmp2_; - gpointer _tmp3_; - gboolean _tmp4_ = FALSE; - GeeList* _tmp5_; + gpointer _tmp2_; + gboolean _tmp3_ = FALSE; + GeeList* _tmp4_; GeeList* backlinks = NULL; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 179 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1076,135 +1194,130 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { result = NULL; #line 181 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1080 "DataSource.c" +#line 1198 "DataSource.c" } #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = name; + _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name); #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_); -#line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp3_; + values = (GeeList*) _tmp2_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = values; + _tmp4_ = values; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = TRUE; -#line 1096 "DataSource.c" + _tmp3_ = TRUE; +#line 1212 "DataSource.c" } else { - GeeList* _tmp6_; + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = values; + _tmp5_ = values; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp8_ == 0; -#line 1109 "DataSource.c" + _tmp3_ = _tmp7_ == 0; +#line 1225 "DataSource.c" } #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp4_) { + if (_tmp3_) { #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = NULL; #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1119 "DataSource.c" +#line 1235 "DataSource.c" } #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, NULL, NULL, NULL); #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala" - backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList); -#line 1125 "DataSource.c" + backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList); +#line 1241 "DataSource.c" { GeeList* _value_list = NULL; + GeeList* _tmp9_; GeeList* _tmp10_; - GeeList* _tmp11_; gint _value_size = 0; - GeeList* _tmp12_; + GeeList* _tmp11_; + gint _tmp12_; gint _tmp13_; - gint _tmp14_; gint _value_index = 0; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = values; + _tmp9_ = values; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_list = _tmp11_; + _value_list = _tmp10_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = _value_list; + _tmp11_ = _value_list; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_size = _tmp14_; + _value_size = _tmp13_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _value_index = -1; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1153 "DataSource.c" +#line 1269 "DataSource.c" + gint _tmp14_; gint _tmp15_; gint _tmp16_; - gint _tmp17_; gchar* value = NULL; - GeeList* _tmp18_; - gint _tmp19_; - gpointer _tmp20_; - GeeList* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp23_; - SourceBacklink* _tmp24_; - SourceBacklink* _tmp25_; + GeeList* _tmp17_; + gint _tmp18_; + gpointer _tmp19_; + GeeList* _tmp20_; + const gchar* _tmp21_; + SourceBacklink* _tmp22_; + SourceBacklink* _tmp23_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = _value_index; + _tmp14_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_index = _tmp15_ + 1; + _value_index = _tmp14_ + 1; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = _value_index; + _tmp15_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = _value_size; + _tmp16_ = _value_size; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!(_tmp16_ < _tmp17_)) { + if (!(_tmp15_ < _tmp16_)) { #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1178 "DataSource.c" +#line 1293 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = _value_list; + _tmp17_ = _value_list; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = _value_index; + _tmp18_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = gee_list_get (_tmp18_, _tmp19_); + _tmp19_ = gee_list_get (_tmp17_, _tmp18_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value = (gchar*) _tmp20_; + value = (gchar*) _tmp19_; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = backlinks; + _tmp20_ = backlinks; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = name; + _tmp21_ = value; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = value; + _tmp22_ = source_backlink_new (name, _tmp21_); #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = source_backlink_new (_tmp22_, _tmp23_); + _tmp23_ = _tmp22_; #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = _tmp24_; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); #line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); -#line 189 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _source_backlink_unref0 (_tmp25_); + _source_backlink_unref0 (_tmp23_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1204 "DataSource.c" +#line 1317 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1208 "DataSource.c" +#line 1321 "DataSource.c" } #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = backlinks; @@ -1212,26 +1325,27 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _g_object_unref0 (values); #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1216 "DataSource.c" +#line 1329 "DataSource.c" } -void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { +void +data_source_set_backlink (DataSource* self, + SourceBacklink* backlink) +{ GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - GeeList* _tmp6_; - GeeList* _tmp13_; - SourceBacklink* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; + gpointer _tmp4_; + GeeList* _tmp5_; + GeeList* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; SourceCollection* sources = NULL; - DataCollection* _tmp17_; - SourceCollection* _tmp18_; + DataCollection* _tmp14_; + SourceCollection* _tmp15_; #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1243,114 +1357,106 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = backlink; + _tmp2_ = source_backlink_get_name (backlink); #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = source_backlink_get_name (_tmp2_); -#line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); #line 198 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp5_; + values = (GeeList*) _tmp4_; #line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = values; + _tmp5_ = values; #line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_ == NULL) { -#line 1260 "DataSource.c" - GeeArrayList* _tmp7_; - GeeHashMap* _tmp8_; - SourceBacklink* _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; - GeeList* _tmp12_; + if (_tmp5_ == NULL) { +#line 1372 "DataSource.c" + GeeArrayList* _tmp6_; + GeeHashMap* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + GeeList* _tmp10_; #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList); -#line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = self->priv->backlinks; + values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList); #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = backlink; + _tmp7_ = self->priv->backlinks; #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = source_backlink_get_name (_tmp9_); + _tmp8_ = source_backlink_get_name (backlink); #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = values; + _tmp10_ = values; #line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); -#line 1285 "DataSource.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); +#line 1394 "DataSource.c" } #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = values; -#line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = backlink; + _tmp11_ = values; #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = source_backlink_get_value (_tmp14_); + _tmp12_ = source_backlink_get_value (backlink); #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = _tmp15_; + _tmp13_ = _tmp12_; #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); #line 206 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp14_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 206 "/home/jens/Source/shotwell/src/core/DataSource.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection); + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = sources; + _tmp15_ = sources; #line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp18_ != NULL) { -#line 1305 "DataSource.c" - SourceCollection* _tmp19_; - SourceBacklink* _tmp20_; -#line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = sources; + if (_tmp15_ != NULL) { +#line 1412 "DataSource.c" + SourceCollection* _tmp16_; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = backlink; + _tmp16_ = sources; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_collection_internal_backlink_set (_tmp19_, self, _tmp20_); -#line 1314 "DataSource.c" + source_collection_internal_backlink_set (_tmp16_, self, backlink); +#line 1418 "DataSource.c" } #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (sources); #line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); -#line 1320 "DataSource.c" +#line 1424 "DataSource.c" } -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink) { +gboolean +data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; GeeList* values = NULL; GeeHashMap* _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; - gpointer _tmp5_; - GeeList* _tmp6_; + gpointer _tmp4_; + GeeList* _tmp5_; gint original_size = 0; - GeeList* _tmp7_; + GeeList* _tmp6_; + gint _tmp7_; gint _tmp8_; gint _tmp9_; - gint _tmp10_; GeeIterator* iter = NULL; - GeeList* _tmp11_; - GeeIterator* _tmp12_; - GeeList* _tmp23_; - gint _tmp24_; - gint _tmp25_; - SourceCollection* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; + GeeList* _tmp10_; + GeeIterator* _tmp11_; + GeeList* _tmp20_; + gint _tmp21_; + gint _tmp22_; + SourceCollection* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; SourceCollection* sources = NULL; - DataCollection* _tmp33_; - SourceCollection* _tmp34_; - GeeList* _tmp37_; - gint _tmp38_; - gint _tmp39_; - gint _tmp40_; + DataCollection* _tmp29_; + SourceCollection* _tmp30_; + GeeList* _tmp32_; + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 211 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1363,163 +1469,149 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink result = FALSE; #line 213 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1367 "DataSource.c" +#line 1473 "DataSource.c" } #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = backlink; -#line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = source_backlink_get_name (_tmp2_); + _tmp2_ = source_backlink_get_name (backlink); #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); + _tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_); #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp5_; + values = (GeeList*) _tmp4_; #line 216 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = values; + _tmp5_ = values; #line 216 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = FALSE; #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1391 "DataSource.c" +#line 1495 "DataSource.c" } #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = values; + _tmp6_ = values; #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" - original_size = _tmp9_; + original_size = _tmp8_; #line 220 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = original_size; + _tmp9_ = original_size; #line 220 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp10_ > 0, "original_size > 0"); + _vala_assert (_tmp9_ > 0, "original_size > 0"); #line 222 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = values; + _tmp10_ = values; #line 222 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 222 "/home/jens/Source/shotwell/src/core/DataSource.vala" - iter = _tmp12_; + iter = _tmp11_; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1413 "DataSource.c" +#line 1517 "DataSource.c" + GeeIterator* _tmp12_; GeeIterator* _tmp13_; - gboolean _tmp14_; - GeeIterator* _tmp15_; - gpointer _tmp16_; - gchar* _tmp17_; - SourceBacklink* _tmp18_; - const gchar* _tmp19_; - const gchar* _tmp20_; - gboolean _tmp21_; -#line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = iter; + gpointer _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + gboolean _tmp18_; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = gee_iterator_next (_tmp13_); + _tmp12_ = iter; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp14_) { + if (!gee_iterator_next (_tmp12_)) { #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1431 "DataSource.c" +#line 1531 "DataSource.c" } #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = iter; -#line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = gee_iterator_get (_tmp15_); + _tmp13_ = iter; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = (gchar*) _tmp16_; + _tmp14_ = gee_iterator_get (_tmp13_); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = backlink; + _tmp15_ = (gchar*) _tmp14_; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = source_backlink_get_value (_tmp18_); + _tmp16_ = source_backlink_get_value (backlink); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = g_strcmp0 (_tmp17_, _tmp20_) == 0; + _tmp18_ = g_strcmp0 (_tmp15_, _tmp17_) == 0; #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp15_); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp21_) { -#line 1451 "DataSource.c" - GeeIterator* _tmp22_; + if (_tmp18_) { +#line 1549 "DataSource.c" + GeeIterator* _tmp19_; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = iter; + _tmp19_ = iter; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_iterator_remove (_tmp22_); -#line 1457 "DataSource.c" + gee_iterator_remove (_tmp19_); +#line 1555 "DataSource.c" } } #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = values; + _tmp20_ = values; #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp25_ == 0) { -#line 1468 "DataSource.c" - GeeHashMap* _tmp26_; - SourceBacklink* _tmp27_; - const gchar* _tmp28_; - const gchar* _tmp29_; -#line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp26_ = self->priv->backlinks; + if (_tmp22_ == 0) { +#line 1566 "DataSource.c" + GeeHashMap* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp27_ = backlink; + _tmp23_ = self->priv->backlinks; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp28_ = source_backlink_get_name (_tmp27_); + _tmp24_ = source_backlink_get_name (backlink); #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL); -#line 1483 "DataSource.c" + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_, NULL); +#line 1578 "DataSource.c" } #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp30_ = self->priv->unlinked_from_collection; + _tmp26_ = self->priv->unlinked_from_collection; #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp31_ = data_source_dehydrate_backlinks (self); + _tmp27_ = data_source_dehydrate_backlinks (self); #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - data_source_commit_backlinks (self, _tmp30_, _tmp32_); + data_source_commit_backlinks (self, _tmp26_, _tmp28_); #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp28_); #line 235 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp29_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 235 "/home/jens/Source/shotwell/src/core/DataSource.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_SOURCE_COLLECTION, SourceCollection); + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp34_ = sources; + _tmp30_ = sources; #line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp34_ != NULL) { -#line 1503 "DataSource.c" - SourceCollection* _tmp35_; - SourceBacklink* _tmp36_; + if (_tmp30_ != NULL) { +#line 1598 "DataSource.c" + SourceCollection* _tmp31_; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp35_ = sources; + _tmp31_ = sources; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36_ = backlink; -#line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_collection_internal_backlink_removed (_tmp35_, self, _tmp36_); -#line 1512 "DataSource.c" + source_collection_internal_backlink_removed (_tmp31_, self, backlink); +#line 1604 "DataSource.c" } #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp37_ = values; + _tmp32_ = values; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp38_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp39_ = _tmp38_; + _tmp34_ = _tmp33_; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp40_ = original_size; + _tmp35_ = original_size; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp39_ != _tmp40_; + result = _tmp34_ != _tmp35_; #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (sources); #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1528,69 +1620,73 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _g_object_unref0 (values); #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1532 "DataSource.c" +#line 1624 "DataSource.c" } -static void data_source_real_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated) { +static void +data_source_real_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated) +{ gboolean _tmp0_ = FALSE; - SourceCollection* _tmp1_; #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources)); #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = sources; -#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp1_ != NULL) { + if (sources != NULL) { #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1547 "DataSource.c" +#line 1640 "DataSource.c" } else { - const gchar* _tmp2_; #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = dehydrated; -#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = _tmp2_ != NULL; -#line 1554 "DataSource.c" + _tmp0_ = dehydrated != NULL; +#line 1644 "DataSource.c" } #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { -#line 1558 "DataSource.c" - gchar* _tmp3_; - gchar* _tmp4_; +#line 1648 "DataSource.c" + gchar* _tmp1_; + gchar* _tmp2_; #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp4_); + g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp2_); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp4_); -#line 1569 "DataSource.c" + _g_free0 (_tmp2_); +#line 1659 "DataSource.c" } } -void data_source_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated) { +void +data_source_commit_backlinks (DataSource* self, + SourceCollection* sources, + const gchar* dehydrated) +{ #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->commit_backlinks (self, sources, dehydrated); -#line 1579 "DataSource.c" +#line 1673 "DataSource.c" } -static gchar* data_source_dehydrate_backlinks (DataSource* self) { +static gchar* +data_source_dehydrate_backlinks (DataSource* self) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; GeeHashMap* _tmp1_; GString* builder = NULL; GString* _tmp5_; - const gchar* _tmp51_ = NULL; - GString* _tmp52_; - const gchar* _tmp53_; - gint _tmp54_; - gint _tmp55_; - gchar* _tmp58_; + const gchar* _tmp49_ = NULL; + GString* _tmp50_; + const gchar* _tmp51_; + gint _tmp52_; + gint _tmp53_; + gchar* _tmp56_; #line 253 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1599,7 +1695,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (_tmp1_ == NULL) { #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1603 "DataSource.c" +#line 1699 "DataSource.c" } else { GeeHashMap* _tmp2_; gint _tmp3_; @@ -1612,7 +1708,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp4_ = _tmp3_; #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp4_ == 0; -#line 1616 "DataSource.c" +#line 1712 "DataSource.c" } #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { @@ -1620,13 +1716,13 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { result = NULL; #line 255 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1624 "DataSource.c" +#line 1720 "DataSource.c" } #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = g_string_new (""); #line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala" builder = _tmp5_; -#line 1630 "DataSource.c" +#line 1726 "DataSource.c" { GeeIterator* _name_it = NULL; GeeHashMap* _tmp6_; @@ -1653,209 +1749,203 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _name_it = _tmp11_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1657 "DataSource.c" +#line 1753 "DataSource.c" GeeIterator* _tmp12_; - gboolean _tmp13_; gchar* name = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; + GeeIterator* _tmp13_; + gpointer _tmp14_; GeeList* values = NULL; - GeeHashMap* _tmp16_; - const gchar* _tmp17_; - gpointer _tmp18_; - gboolean _tmp19_ = FALSE; - GeeList* _tmp20_; + GeeHashMap* _tmp15_; + const gchar* _tmp16_; + gpointer _tmp17_; + gboolean _tmp18_ = FALSE; + GeeList* _tmp19_; gchar* value_field = NULL; - gchar* _tmp24_; - const gchar* _tmp43_; - gint _tmp44_; - gint _tmp45_; + gchar* _tmp23_; + const gchar* _tmp41_; + gint _tmp42_; + gint _tmp43_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = _name_it; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp12_)) { #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1682 "DataSource.c" +#line 1775 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = _name_it; + _tmp13_ = _name_it; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" - name = (gchar*) _tmp15_; + name = (gchar*) _tmp14_; #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = self->priv->backlinks; + _tmp15_ = self->priv->backlinks; #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = name; + _tmp16_ = name; #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_); + _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_); #line 259 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = (GeeList*) _tmp18_; + values = (GeeList*) _tmp17_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = values; + _tmp19_ = values; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp20_ == NULL) { + if (_tmp19_ == NULL) { #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = TRUE; -#line 1704 "DataSource.c" + _tmp18_ = TRUE; +#line 1797 "DataSource.c" } else { - GeeList* _tmp21_; + GeeList* _tmp20_; + gint _tmp21_; gint _tmp22_; - gint _tmp23_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = values; + _tmp20_ = values; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = _tmp23_ == 0; -#line 1717 "DataSource.c" + _tmp18_ = _tmp22_ == 0; +#line 1810 "DataSource.c" } #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp19_) { + if (_tmp18_) { #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (name); #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 1727 "DataSource.c" +#line 1820 "DataSource.c" } #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = g_strdup (""); + _tmp23_ = g_strdup (""); #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_field = _tmp24_; -#line 1733 "DataSource.c" + value_field = _tmp23_; +#line 1826 "DataSource.c" { GeeList* _value_list = NULL; + GeeList* _tmp24_; GeeList* _tmp25_; - GeeList* _tmp26_; gint _value_size = 0; - GeeList* _tmp27_; + GeeList* _tmp26_; + gint _tmp27_; gint _tmp28_; - gint _tmp29_; gint _value_index = 0; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = values; + _tmp24_ = values; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp26_ = _g_object_ref0 (_tmp25_); + _tmp25_ = _g_object_ref0 (_tmp24_); #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_list = _tmp26_; + _value_list = _tmp25_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp27_ = _value_list; + _tmp26_ = _value_list; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_size = _tmp29_; + _value_size = _tmp28_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _value_index = -1; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1761 "DataSource.c" +#line 1854 "DataSource.c" + gint _tmp29_; gint _tmp30_; gint _tmp31_; - gint _tmp32_; gchar* value = NULL; - GeeList* _tmp33_; - gint _tmp34_; - gpointer _tmp35_; - const gchar* _tmp36_; - gboolean _tmp37_; + GeeList* _tmp32_; + gint _tmp33_; + gpointer _tmp34_; + const gchar* _tmp35_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp30_ = _value_index; + _tmp29_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _value_index = _tmp30_ + 1; + _value_index = _tmp29_ + 1; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp31_ = _value_index; + _tmp30_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp32_ = _value_size; + _tmp31_ = _value_size; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!(_tmp31_ < _tmp32_)) { + if (!(_tmp30_ < _tmp31_)) { #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1783 "DataSource.c" +#line 1875 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp33_ = _value_list; + _tmp32_ = _value_list; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp34_ = _value_index; + _tmp33_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp35_ = gee_list_get (_tmp33_, _tmp34_); + _tmp34_ = gee_list_get (_tmp32_, _tmp33_); #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value = (gchar*) _tmp35_; + value = (gchar*) _tmp34_; #line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36_ = value; + _tmp35_ = value; #line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp37_ = is_string_empty (_tmp36_); -#line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp37_) { -#line 1799 "DataSource.c" - const gchar* _tmp38_; - const gchar* _tmp39_; + if (!is_string_empty (_tmp35_)) { +#line 1889 "DataSource.c" + const gchar* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; gchar* _tmp40_; - gchar* _tmp41_; - gchar* _tmp42_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp38_ = value_field; + _tmp36_ = value_field; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp39_ = value; + _tmp37_ = value; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp40_ = g_strconcat (_tmp39_, "|", NULL); + _tmp38_ = g_strconcat (_tmp37_, "|", NULL); #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp41_ = _tmp40_; + _tmp39_ = _tmp38_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL); + _tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL); #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value_field); #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_field = _tmp42_; + value_field = _tmp40_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp41_); -#line 1821 "DataSource.c" + _g_free0 (_tmp39_); +#line 1911 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1825 "DataSource.c" +#line 1915 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1829 "DataSource.c" +#line 1919 "DataSource.c" } #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp43_ = value_field; + _tmp41_ = value_field; #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp44_ = strlen (_tmp43_); + _tmp42_ = strlen (_tmp41_); #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp45_ = _tmp44_; + _tmp43_ = _tmp42_; #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp45_ > 0) { -#line 1839 "DataSource.c" - GString* _tmp46_; - const gchar* _tmp47_; - const gchar* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; + if (_tmp43_ > 0) { +#line 1929 "DataSource.c" + GString* _tmp44_; + const gchar* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp46_ = builder; + _tmp44_ = builder; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp47_ = name; + _tmp45_ = name; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp48_ = value_field; + _tmp46_ = value_field; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp49_ = g_strdup_printf ("%s=%s\n", _tmp47_, _tmp48_); + _tmp47_ = g_strdup_printf ("%s=%s\n", _tmp45_, _tmp46_); #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp50_ = _tmp49_; + _tmp48_ = _tmp47_; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_string_append (_tmp46_, _tmp50_); + g_string_append (_tmp44_, _tmp48_); #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp50_); -#line 1859 "DataSource.c" + _g_free0 (_tmp48_); +#line 1949 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value_field); @@ -1863,310 +1953,305 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _g_object_unref0 (values); #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (name); -#line 1867 "DataSource.c" +#line 1957 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_name_it); -#line 1871 "DataSource.c" +#line 1961 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp52_ = builder; + _tmp50_ = builder; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp53_ = _tmp52_->str; + _tmp51_ = _tmp50_->str; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp54_ = strlen (_tmp53_); + _tmp52_ = strlen (_tmp51_); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp55_ = _tmp54_; + _tmp53_ = _tmp52_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp55_ > 0) { -#line 1883 "DataSource.c" - GString* _tmp56_; - const gchar* _tmp57_; + if (_tmp53_ > 0) { +#line 1973 "DataSource.c" + GString* _tmp54_; + const gchar* _tmp55_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp56_ = builder; + _tmp54_ = builder; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp57_ = _tmp56_->str; + _tmp55_ = _tmp54_->str; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp51_ = _tmp57_; -#line 1892 "DataSource.c" + _tmp49_ = _tmp55_; +#line 1982 "DataSource.c" } else { #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp51_ = NULL; -#line 1896 "DataSource.c" + _tmp49_ = NULL; +#line 1986 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp58_ = g_strdup (_tmp51_); + _tmp56_ = g_strdup (_tmp49_); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp58_; + result = _tmp56_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_string_free0 (builder); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1906 "DataSource.c" +#line 1996 "DataSource.c" } -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated) { - SourceCollection* _tmp0_; - GeeHashMap* _tmp1_; - const gchar* _tmp2_; +void +data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated) +{ + GeeHashMap* _tmp0_; gchar** lines = NULL; - const gchar* _tmp3_; - gchar** _tmp4_; - gchar** _tmp5_; + gchar** _tmp1_; + gchar** _tmp2_; gint lines_length1; gint _lines_size_; - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp3_; + gint _tmp3__length1; #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (unlinked_from)); #line 279 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = unlinked_from; -#line 279 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->unlinked_from_collection = _tmp0_; + self->priv->unlinked_from_collection = unlinked_from; #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->backlinks); #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->backlinks = _tmp1_; + self->priv->backlinks = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = dehydrated; -#line 282 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_ == NULL) { + if (dehydrated == NULL) { #line 283 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 1942 "DataSource.c" +#line 2029 "DataSource.c" } #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = dehydrated; -#line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, "\n", 0); + _tmp2_ = _tmp1_ = g_strsplit (dehydrated, "\n", 0); #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - lines = _tmp5_; + lines = _tmp2_; #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" - lines_length1 = _vala_array_length (_tmp4_); + lines_length1 = _vala_array_length (_tmp1_); #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" _lines_size_ = lines_length1; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = lines; + _tmp3_ = lines; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6__length1 = lines_length1; -#line 1958 "DataSource.c" + _tmp3__length1 = lines_length1; +#line 2043 "DataSource.c" { gchar** line_collection = NULL; gint line_collection_length1 = 0; gint _line_collection_size_ = 0; gint line_it = 0; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - line_collection = _tmp6_; + line_collection = _tmp3_; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - line_collection_length1 = _tmp6__length1; + line_collection_length1 = _tmp3__length1; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - for (line_it = 0; line_it < _tmp6__length1; line_it = line_it + 1) { -#line 1970 "DataSource.c" - gchar* _tmp7_; + for (line_it = 0; line_it < _tmp3__length1; line_it = line_it + 1) { +#line 2055 "DataSource.c" + gchar* _tmp4_; gchar* line = NULL; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = g_strdup (line_collection[line_it]); + _tmp4_ = g_strdup (line_collection[line_it]); #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" - line = _tmp7_; -#line 1977 "DataSource.c" + line = _tmp4_; +#line 2062 "DataSource.c" { - const gchar* _tmp8_; - gint _tmp9_; - gint _tmp10_; + const gchar* _tmp5_; + gint _tmp6_; + gint _tmp7_; gchar** tokens = NULL; - const gchar* _tmp11_; - gchar** _tmp12_; - gchar** _tmp13_; + const gchar* _tmp8_; + gchar** _tmp9_; + gchar** _tmp10_; gint tokens_length1; gint _tokens_size_; - gchar** _tmp14_; - gint _tmp14__length1; + gchar** _tmp11_; + gint _tmp11__length1; gchar** decoded_values = NULL; + gchar** _tmp15_; + gint _tmp15__length1; + const gchar* _tmp16_; + gchar** _tmp17_; gchar** _tmp18_; - gint _tmp18__length1; - const gchar* _tmp19_; - gchar** _tmp20_; - gchar** _tmp21_; gint decoded_values_length1; gint _decoded_values_size_; GeeList* values = NULL; - GeeArrayList* _tmp22_; - gchar** _tmp23_; - gint _tmp23__length1; - GeeList* _tmp32_; - gint _tmp33_; - gint _tmp34_; + GeeArrayList* _tmp19_; + gchar** _tmp20_; + gint _tmp20__length1; + GeeList* _tmp29_; + gint _tmp30_; + gint _tmp31_; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = line; + _tmp5_ = line; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = strlen (_tmp8_); + _tmp6_ = strlen (_tmp5_); #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp10_ == 0) { + if (_tmp7_ == 0) { #line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (line); #line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 2017 "DataSource.c" +#line 2102 "DataSource.c" } #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = line; + _tmp8_ = line; #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = _tmp12_ = g_strsplit (_tmp11_, "=", 2); + _tmp10_ = _tmp9_ = g_strsplit (_tmp8_, "=", 2); #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - tokens = _tmp13_; + tokens = _tmp10_; #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" - tokens_length1 = _vala_array_length (_tmp12_); + tokens_length1 = _vala_array_length (_tmp9_); #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tokens_size_ = tokens_length1; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = tokens; + _tmp11_ = tokens; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14__length1 = tokens_length1; + _tmp11__length1 = tokens_length1; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp14__length1 < 2) { -#line 2035 "DataSource.c" - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; + if (_tmp11__length1 < 2) { +#line 2120 "DataSource.c" + const gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = line; + _tmp12_ = line; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_warning ("DataSource.vala:292: Unable to rehydrate \"%s\" for %s: name and value" \ -" not present", _tmp15_, _tmp17_); +" not present", _tmp12_, _tmp14_); #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp14_); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (line); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 2055 "DataSource.c" +#line 2140 "DataSource.c" } #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = tokens; + _tmp15_ = tokens; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18__length1 = tokens_length1; + _tmp15__length1 = tokens_length1; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = _tmp18_[1]; + _tmp16_ = _tmp15_[1]; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = _tmp20_ = g_strsplit (_tmp19_, "|", 0); + _tmp18_ = _tmp17_ = g_strsplit (_tmp16_, "|", 0); #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - decoded_values = _tmp21_; + decoded_values = _tmp18_; #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" - decoded_values_length1 = _vala_array_length (_tmp20_); + decoded_values_length1 = _vala_array_length (_tmp17_); #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" _decoded_values_size_ = decoded_values_length1; #line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp19_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala" - values = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_LIST, GeeList); + values = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_LIST, GeeList); #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = decoded_values; + _tmp20_ = decoded_values; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23__length1 = decoded_values_length1; -#line 2079 "DataSource.c" + _tmp20__length1 = decoded_values_length1; +#line 2164 "DataSource.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; gint _value_collection_size_ = 0; gint value_it = 0; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_collection = _tmp23_; + value_collection = _tmp20_; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value_collection_length1 = _tmp23__length1; + value_collection_length1 = _tmp20__length1; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - for (value_it = 0; value_it < _tmp23__length1; value_it = value_it + 1) { -#line 2091 "DataSource.c" - gchar* _tmp24_; + for (value_it = 0; value_it < _tmp20__length1; value_it = value_it + 1) { +#line 2176 "DataSource.c" + gchar* _tmp21_; gchar* value = NULL; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = g_strdup (value_collection[value_it]); + _tmp21_ = g_strdup (value_collection[value_it]); #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" - value = _tmp24_; -#line 2098 "DataSource.c" + value = _tmp21_; +#line 2183 "DataSource.c" { - gboolean _tmp25_ = FALSE; - const gchar* _tmp26_; + gboolean _tmp22_ = FALSE; + const gchar* _tmp23_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp26_ = value; + _tmp23_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp26_ != NULL) { -#line 2106 "DataSource.c" - const gchar* _tmp27_; - gint _tmp28_; - gint _tmp29_; + if (_tmp23_ != NULL) { +#line 2191 "DataSource.c" + const gchar* _tmp24_; + gint _tmp25_; + gint _tmp26_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp27_ = value; + _tmp24_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp28_ = strlen (_tmp27_); + _tmp25_ = strlen (_tmp24_); #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = _tmp29_ > 0; -#line 2118 "DataSource.c" + _tmp22_ = _tmp26_ > 0; +#line 2203 "DataSource.c" } else { #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp25_ = FALSE; -#line 2122 "DataSource.c" + _tmp22_ = FALSE; +#line 2207 "DataSource.c" } #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp25_) { -#line 2126 "DataSource.c" - GeeList* _tmp30_; - const gchar* _tmp31_; + if (_tmp22_) { +#line 2211 "DataSource.c" + GeeList* _tmp27_; + const gchar* _tmp28_; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp30_ = values; + _tmp27_ = values; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp31_ = value; + _tmp28_ = value; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); -#line 2135 "DataSource.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); +#line 2220 "DataSource.c" } #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 2139 "DataSource.c" +#line 2224 "DataSource.c" } } } #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp32_ = values; + _tmp29_ = values; #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp34_ = _tmp33_; + _tmp31_ = _tmp30_; #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp34_ > 0) { -#line 2151 "DataSource.c" - GeeHashMap* _tmp35_; - gchar** _tmp36_; - gint _tmp36__length1; - const gchar* _tmp37_; - GeeList* _tmp38_; + if (_tmp31_ > 0) { +#line 2236 "DataSource.c" + GeeHashMap* _tmp32_; + gchar** _tmp33_; + gint _tmp33__length1; + const gchar* _tmp34_; + GeeList* _tmp35_; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp35_ = self->priv->backlinks; + _tmp32_ = self->priv->backlinks; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36_ = tokens; + _tmp33_ = tokens; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp36__length1 = tokens_length1; + _tmp33__length1 = tokens_length1; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp37_ = _tmp36_[0]; + _tmp34_ = _tmp33_[0]; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp38_ = values; + _tmp35_ = values; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp37_, _tmp38_); -#line 2169 "DataSource.c" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_); +#line 2254 "DataSource.c" } #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); @@ -2176,88 +2261,105 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL); #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (line); -#line 2179 "DataSource.c" +#line 2264 "DataSource.c" } } } #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL); -#line 2185 "DataSource.c" +#line 2270 "DataSource.c" } -static SourceSnapshot* data_source_real_save_snapshot (DataSource* self) { +static SourceSnapshot* +data_source_real_save_snapshot (DataSource* self) +{ SourceSnapshot* result = NULL; #line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = NULL; #line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2195 "DataSource.c" +#line 2282 "DataSource.c" } -SourceSnapshot* data_source_save_snapshot (DataSource* self) { +SourceSnapshot* +data_source_save_snapshot (DataSource* self) +{ #line 311 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), NULL); #line 311 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->save_snapshot (self); -#line 2204 "DataSource.c" +#line 2293 "DataSource.c" } -void data_source_internal_mark_for_destroy (DataSource* self) { +void +data_source_internal_mark_for_destroy (DataSource* self) +{ #line 316 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 317 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->marked_for_destroy = TRUE; -#line 2213 "DataSource.c" +#line 2304 "DataSource.c" } -static gboolean data_source_real_internal_delete_backing (DataSource* self, GError** error) { +static gboolean +data_source_real_internal_delete_backing (DataSource* self, + GError** error) +{ gboolean result = FALSE; #line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = TRUE; #line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2223 "DataSource.c" +#line 2317 "DataSource.c" } -gboolean data_source_internal_delete_backing (DataSource* self, GError** error) { +gboolean +data_source_internal_delete_backing (DataSource* self, + GError** error) +{ #line 324 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 324 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->internal_delete_backing (self, error); -#line 2232 "DataSource.c" +#line 2329 "DataSource.c" } -static gboolean data_source_real_equals (DataSource* self, DataSource* source) { +static gboolean +data_source_real_equals (DataSource* self, + DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = self == _tmp0_; + result = self == source; #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2247 "DataSource.c" +#line 2344 "DataSource.c" } -gboolean data_source_equals (DataSource* self, DataSource* source) { +gboolean +data_source_equals (DataSource* self, + DataSource* source) +{ #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala" return DATA_SOURCE_GET_CLASS (self)->equals (self, source); -#line 2256 "DataSource.c" +#line 2356 "DataSource.c" } -static void data_source_real_destroy (DataSource* self) { +static void +data_source_real_destroy (DataSource* self) +{ gboolean _tmp0_; #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->marked_for_destroy; @@ -2265,19 +2367,19 @@ static void data_source_real_destroy (DataSource* self) { _vala_assert (_tmp0_, "marked_for_destroy"); #line 344 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->is_destroyed = TRUE; -#line 2268 "DataSource.c" +#line 2370 "DataSource.c" { gint ctr = 0; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2273 "DataSource.c" +#line 2375 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2280 "DataSource.c" +#line 2382 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2287,13 +2389,13 @@ static void data_source_real_destroy (DataSource* self) { DataView* _tmp7_; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2290 "DataSource.c" +#line 2392 "DataSource.c" gint _tmp2_; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2296 "DataSource.c" +#line 2398 "DataSource.c" } #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2307,7 +2409,7 @@ static void data_source_real_destroy (DataSource* self) { if (!(_tmp3_ < _tmp4__length1)) { #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2310 "DataSource.c" +#line 2412 "DataSource.c" } #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2319,7 +2421,7 @@ static void data_source_real_destroy (DataSource* self) { _tmp7_ = _tmp5_[_tmp6_]; #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2322 "DataSource.c" +#line 2424 "DataSource.c" DataView* view = NULL; DataView** _tmp8_; gint _tmp8__length1; @@ -2361,116 +2463,115 @@ static void data_source_real_destroy (DataSource* self) { data_view_notify_unsubscribed (_tmp15_, self); #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (view); -#line 2364 "DataSource.c" +#line 2466 "DataSource.c" } } } } #line 357 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL], 0); -#line 2371 "DataSource.c" +#line 2473 "DataSource.c" } -void data_source_destroy (DataSource* self) { +void +data_source_destroy (DataSource* self) +{ #line 340 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 340 "/home/jens/Source/shotwell/src/core/DataSource.vala" DATA_SOURCE_GET_CLASS (self)->destroy (self); -#line 2380 "DataSource.c" +#line 2484 "DataSource.c" } -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) { +gboolean +data_source_destroy_orphan (DataSource* self, + gboolean delete_backing) +{ gboolean result = FALSE; gboolean ret = FALSE; - gboolean _tmp0_; - SourceCollection* _tmp11_; + SourceCollection* _tmp9_; GError * _inner_error_ = NULL; #line 366 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); #line 367 "/home/jens/Source/shotwell/src/core/DataSource.vala" ret = TRUE; #line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = delete_backing; -#line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp0_) { -#line 2398 "DataSource.c" + if (delete_backing) { +#line 2502 "DataSource.c" { - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; - gboolean _tmp3_; -#line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = data_source_internal_delete_backing (self, &_inner_error_); + gboolean _tmp0_ = FALSE; + gboolean _tmp1_; #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = _tmp2_; + _tmp0_ = data_source_internal_delete_backing (self, &_inner_error_); #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2409 "DataSource.c" +#line 2510 "DataSource.c" goto __catch54_g_error; } #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ret = _tmp1_; + ret = _tmp0_; #line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = ret; + _tmp1_ = ret; #line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp3_) { -#line 2418 "DataSource.c" - gchar* _tmp4_; - gchar* _tmp5_; + if (!_tmp1_) { +#line 2519 "DataSource.c" + gchar* _tmp2_; + gchar* _tmp3_; #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp5_); + g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp3_); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp5_); -#line 2429 "DataSource.c" + _g_free0 (_tmp3_); +#line 2530 "DataSource.c" } } goto __finally54; __catch54_g_error: { GError* err = NULL; - gchar* _tmp6_; - gchar* _tmp7_; - GError* _tmp8_; - const gchar* _tmp9_; + gchar* _tmp4_; + gchar* _tmp5_; + GError* _tmp6_; + const gchar* _tmp7_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" err = _inner_error_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" _inner_error_ = NULL; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = err; + _tmp6_ = err; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = _tmp8_->message; + _tmp7_ = _tmp6_->message; #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_warning ("DataSource.vala:375: Unable to delete backing for %s: %s", _tmp7_, _tmp9_); + g_warning ("DataSource.vala:375: Unable to delete backing for %s: %s", _tmp5_, _tmp7_); #line 375 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 376 "/home/jens/Source/shotwell/src/core/DataSource.vala" ret = FALSE; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_error_free0 (err); -#line 2460 "DataSource.c" +#line 2561 "DataSource.c" } __finally54: #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2465 "DataSource.c" - gboolean _tmp10_ = FALSE; +#line 2566 "DataSource.c" + gboolean _tmp8_ = FALSE; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_clear_error (&_inner_error_); #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" - return _tmp10_; -#line 2473 "DataSource.c" + return _tmp8_; +#line 2574 "DataSource.c" } } #line 380 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2478,48 +2579,55 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) #line 381 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_destroy (self); #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = self->priv->unlinked_from_collection; + _tmp9_ = self->priv->unlinked_from_collection; #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp11_ != NULL) { -#line 2484 "DataSource.c" - SourceCollection* _tmp12_; + if (_tmp9_ != NULL) { +#line 2585 "DataSource.c" + SourceCollection* _tmp10_; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = self->priv->unlinked_from_collection; + _tmp10_ = self->priv->unlinked_from_collection; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_collection_notify_unlinked_destroyed (_tmp12_, self); -#line 2490 "DataSource.c" + source_collection_notify_unlinked_destroyed (_tmp10_, self); +#line 2591 "DataSource.c" } #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = ret; #line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2496 "DataSource.c" +#line 2597 "DataSource.c" } -static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value) { +static void +_vala_array_add66 (DataView** * array, + int* length, + int* size, + DataView* value) +{ #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" if ((*length) == (*size)) { #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" *size = (*size) ? (2 * (*size)) : 4; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" *array = g_renew (DataView*, *array, (*size) + 1); -#line 2507 "DataSource.c" +#line 2613 "DataSource.c" } #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" (*array)[(*length)++] = value; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" (*array)[*length] = NULL; -#line 2513 "DataSource.c" +#line 2619 "DataSource.c" } -void data_source_internal_subscribe (DataSource* self, DataView* view) { +void +data_source_internal_subscribe (DataSource* self, + DataView* view) +{ gboolean _tmp0_; - DataView** _tmp13_; - gint _tmp13__length1; - DataView* _tmp14_; - DataView* _tmp15_; + DataView** _tmp12_; + gint _tmp12__length1; + DataView* _tmp13_; #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 395 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2528,19 +2636,19 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp0_ = self->priv->in_contact; #line 396 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp0_, "!in_contact"); -#line 2531 "DataSource.c" +#line 2639 "DataSource.c" { gint ctr = 0; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2536 "DataSource.c" +#line 2644 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2543 "DataSource.c" +#line 2651 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2550,13 +2658,13 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { DataView* _tmp7_; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2553 "DataSource.c" +#line 2661 "DataSource.c" gint _tmp2_; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2559 "DataSource.c" +#line 2667 "DataSource.c" } #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2570,7 +2678,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { if (!(_tmp3_ < _tmp4__length1)) { #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2573 "DataSource.c" +#line 2681 "DataSource.c" } #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2582,13 +2690,12 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp7_ = _tmp5_[_tmp6_]; #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ == NULL) { -#line 2585 "DataSource.c" +#line 2693 "DataSource.c" DataView** _tmp8_; gint _tmp8__length1; gint _tmp9_; DataView* _tmp10_; DataView* _tmp11_; - DataView* _tmp12_; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2596,37 +2703,36 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp9_ = ctr; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = view; -#line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (view); #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_tmp8_[_tmp9_]); #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_[_tmp9_] = _tmp11_; + _tmp8_[_tmp9_] = _tmp10_; #line 400 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = _tmp8_[_tmp9_]; + _tmp11_ = _tmp8_[_tmp9_]; #line 402 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2610 "DataSource.c" +#line 2715 "DataSource.c" } } } } #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = self->priv->subscribers; + _tmp12_ = self->priv->subscribers; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13__length1 = self->priv->subscribers_length1; + _tmp12__length1 = self->priv->subscribers_length1; #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = view; + _tmp13_ = _g_object_ref0 (view); #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); -#line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_array_add66 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_); -#line 2625 "DataSource.c" + _vala_array_add66 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp13_); +#line 2728 "DataSource.c" } -void data_source_internal_unsubscribe (DataSource* self, DataView* view) { +void +data_source_internal_unsubscribe (DataSource* self, + DataView* view) +{ gboolean _tmp0_; #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); @@ -2636,19 +2742,19 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { _tmp0_ = self->priv->in_contact; #line 412 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp0_, "!in_contact"); -#line 2639 "DataSource.c" +#line 2745 "DataSource.c" { gint ctr = 0; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2644 "DataSource.c" +#line 2750 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2651 "DataSource.c" +#line 2757 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2656,16 +2762,15 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { gint _tmp5__length1; gint _tmp6_; DataView* _tmp7_; - DataView* _tmp8_; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2662 "DataSource.c" +#line 2767 "DataSource.c" gint _tmp2_; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2668 "DataSource.c" +#line 2773 "DataSource.c" } #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2679,7 +2784,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { if (!(_tmp3_ < _tmp4__length1)) { #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2682 "DataSource.c" +#line 2787 "DataSource.c" } #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2690,29 +2795,27 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = _tmp5_[_tmp6_]; #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = view; -#line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp7_ == _tmp8_) { -#line 2696 "DataSource.c" - DataView** _tmp9_; - gint _tmp9__length1; - gint _tmp10_; - DataView* _tmp11_; + if (_tmp7_ == view) { +#line 2799 "DataSource.c" + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->subscribers; + _tmp8_ = self->priv->subscribers; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9__length1 = self->priv->subscribers_length1; + _tmp8__length1 = self->priv->subscribers_length1; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = ctr; + _tmp9_ = ctr; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_object_unref0 (_tmp9_[_tmp10_]); + _g_object_unref0 (_tmp8_[_tmp9_]); #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_[_tmp10_] = NULL; + _tmp8_[_tmp9_] = NULL; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp9_[_tmp10_]; + _tmp10_ = _tmp8_[_tmp9_]; #line 418 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2715 "DataSource.c" +#line 2818 "DataSource.c" } } } @@ -2720,7 +2823,11 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { } -void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target) { +void +data_source_contact_subscribers (DataSource* self, + DataSourceContactSubscriber contact_subscriber, + void* contact_subscriber_target) +{ gboolean _tmp0_; #line 423 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); @@ -2730,19 +2837,19 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _vala_assert (!_tmp0_, "!in_contact"); #line 426 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = TRUE; -#line 2733 "DataSource.c" +#line 2840 "DataSource.c" { gint ctr = 0; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2738 "DataSource.c" +#line 2845 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2745 "DataSource.c" +#line 2852 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2752,13 +2859,13 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri DataView* _tmp7_; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2755 "DataSource.c" +#line 2862 "DataSource.c" gint _tmp2_; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2761 "DataSource.c" +#line 2868 "DataSource.c" } #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2772,7 +2879,7 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri if (!(_tmp3_ < _tmp4__length1)) { #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2775 "DataSource.c" +#line 2882 "DataSource.c" } #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2784,39 +2891,36 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _tmp7_ = _tmp5_[_tmp6_]; #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2787 "DataSource.c" - DataSourceContactSubscriber _tmp8_; - void* _tmp8__target; - DataView** _tmp9_; - gint _tmp9__length1; - gint _tmp10_; - DataView* _tmp11_; -#line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = contact_subscriber; -#line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8__target = contact_subscriber_target; +#line 2894 "DataSource.c" + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->subscribers; + _tmp8_ = self->priv->subscribers; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9__length1 = self->priv->subscribers_length1; + _tmp8__length1 = self->priv->subscribers_length1; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = ctr; + _tmp9_ = ctr; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp9_[_tmp10_]; + _tmp10_ = _tmp8_[_tmp9_]; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ (_tmp11_, _tmp8__target); -#line 2808 "DataSource.c" + contact_subscriber (_tmp10_, contact_subscriber_target); +#line 2909 "DataSource.c" } } } } #line 431 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2815 "DataSource.c" +#line 2916 "DataSource.c" } -void data_source_contact_subscribers_alteration (DataSource* self, Alteration* alteration) { +void +data_source_contact_subscribers_alteration (DataSource* self, + Alteration* alteration) +{ gboolean _tmp0_; #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); @@ -2828,19 +2932,19 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _vala_assert (!_tmp0_, "!in_contact"); #line 437 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = TRUE; -#line 2831 "DataSource.c" +#line 2935 "DataSource.c" { gint ctr = 0; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2836 "DataSource.c" +#line 2940 "DataSource.c" { gboolean _tmp1_ = FALSE; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 2843 "DataSource.c" +#line 2947 "DataSource.c" gint _tmp3_; DataView** _tmp4_; gint _tmp4__length1; @@ -2850,13 +2954,13 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a DataView* _tmp7_; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2853 "DataSource.c" +#line 2957 "DataSource.c" gint _tmp2_; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = ctr; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = _tmp2_ + 1; -#line 2859 "DataSource.c" +#line 2963 "DataSource.c" } #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2870,7 +2974,7 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a if (!(_tmp3_ < _tmp4__length1)) { #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 2873 "DataSource.c" +#line 2977 "DataSource.c" } #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2882,12 +2986,11 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _tmp7_ = _tmp5_[_tmp6_]; #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 2885 "DataSource.c" +#line 2989 "DataSource.c" DataView** _tmp8_; gint _tmp8__length1; gint _tmp9_; DataView* _tmp10_; - Alteration* _tmp11_; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2897,28 +3000,36 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = _tmp8_[_tmp9_]; #line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = alteration; -#line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject), _tmp11_); -#line 2903 "DataSource.c" + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject), alteration); +#line 3004 "DataSource.c" } } } } #line 442 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2910 "DataSource.c" +#line 3011 "DataSource.c" } -static void data_source_real_unlinked (DataSource* self, SourceCollection* sources) { +static void +data_source_real_unlinked (DataSource* self, + SourceCollection* sources) +{ #line 51 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); -#line 2917 "DataSource.c" +#line 3021 "DataSource.c" } -static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (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__DATA_COLLECTION (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__DATA_COLLECTION) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__DATA_COLLECTION callback; register GCClosure * cc; @@ -2933,34 +3044,41 @@ static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, G data1 = closure->data; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data2 = param_values->data[0].v_pointer; -#line 2936 "DataSource.c" +#line 3047 "DataSource.c" } else { #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data1 = param_values->data[0].v_pointer; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data2 = closure->data; -#line 2942 "DataSource.c" +#line 3053 "DataSource.c" } #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" callback = (GMarshalFunc_VOID__DATA_COLLECTION) (marshal_data ? marshal_data : cc->callback); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" callback (data1, value_get_data_collection (param_values + 1), data2); -#line 2948 "DataSource.c" +#line 3059 "DataSource.c" } -static void data_source_real_relinked (DataSource* self, SourceCollection* sources) { +static void +data_source_real_relinked (DataSource* self, + SourceCollection* sources) +{ #line 55 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); -#line 2955 "DataSource.c" +#line 3069 "DataSource.c" } -static void data_source_real_destroyed (DataSource* self) { +static void +data_source_real_destroyed (DataSource* self) +{ } -static void data_source_class_init (DataSourceClass * klass) { +static void +data_source_class_init (DataSourceClass * klass) +{ #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_parent_class = g_type_class_peek_parent (klass); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3009,11 +3127,13 @@ static void data_source_class_init (DataSourceClass * klass) { data_source_signals[DATA_SOURCE_RELINKED_SIGNAL] = g_signal_new ("relinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, relinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL] = g_signal_new ("destroyed", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, destroyed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3012 "DataSource.c" +#line 3130 "DataSource.c" } -static void data_source_instance_init (DataSource * self) { +static void +data_source_instance_init (DataSource * self) +{ DataView** _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = DATA_SOURCE_GET_PRIVATE (self); @@ -3037,11 +3157,13 @@ static void data_source_instance_init (DataSource * self) { self->priv->marked_for_destroy = FALSE; #line 48 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->is_destroyed = FALSE; -#line 3040 "DataSource.c" +#line 3160 "DataSource.c" } -static void data_source_finalize (GObject * obj) { +static void +data_source_finalize (GObject * obj) +{ DataSource * self; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SOURCE, DataSource); @@ -3053,11 +3175,13 @@ static void data_source_finalize (GObject * obj) { _g_object_unref0 (self->priv->backlinks); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" G_OBJECT_CLASS (data_source_parent_class)->finalize (obj); -#line 3056 "DataSource.c" +#line 3178 "DataSource.c" } -GType data_source_get_type (void) { +GType +data_source_get_type (void) +{ static volatile gsize data_source_type_id__volatile = 0; if (g_once_init_enter (&data_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataSource), 0, (GInstanceInitFunc) data_source_instance_init, NULL }; @@ -3069,25 +3193,31 @@ GType data_source_get_type (void) { } -static void source_snapshot_real_notify_broken (SourceSnapshot* self) { +static void +source_snapshot_real_notify_broken (SourceSnapshot* self) +{ #line 455 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->snapshot_broken = TRUE; #line 457 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL], 0); -#line 3077 "DataSource.c" +#line 3203 "DataSource.c" } -void source_snapshot_notify_broken (SourceSnapshot* self) { +void +source_snapshot_notify_broken (SourceSnapshot* self) +{ #line 454 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_SNAPSHOT (self)); #line 454 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_SNAPSHOT_GET_CLASS (self)->notify_broken (self); -#line 3086 "DataSource.c" +#line 3214 "DataSource.c" } -gboolean source_snapshot_is_broken (SourceSnapshot* self) { +gboolean +source_snapshot_is_broken (SourceSnapshot* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 460 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3098,122 +3228,151 @@ gboolean source_snapshot_is_broken (SourceSnapshot* self) { result = _tmp0_; #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3101 "DataSource.c" +#line 3231 "DataSource.c" } -SourceSnapshot* source_snapshot_construct (GType object_type) { +SourceSnapshot* +source_snapshot_construct (GType object_type) +{ SourceSnapshot* self = NULL; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceSnapshot*) g_type_create_instance (object_type); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3111 "DataSource.c" +#line 3243 "DataSource.c" } -static void source_snapshot_real_broken (SourceSnapshot* self) { +static void +source_snapshot_real_broken (SourceSnapshot* self) +{ } -static void value_source_snapshot_init (GValue* value) { +static void +value_source_snapshot_init (GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3122 "DataSource.c" +#line 3258 "DataSource.c" } -static void value_source_snapshot_free_value (GValue* value) { +static void +value_source_snapshot_free_value (GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (value->data[0].v_pointer); -#line 3131 "DataSource.c" +#line 3269 "DataSource.c" } } -static void value_source_snapshot_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_snapshot_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (src_value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_snapshot_ref (src_value->data[0].v_pointer); -#line 3141 "DataSource.c" +#line 3282 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3145 "DataSource.c" +#line 3286 "DataSource.c" } } -static gpointer value_source_snapshot_peek_pointer (const GValue* value) { +static gpointer +value_source_snapshot_peek_pointer (const GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3153 "DataSource.c" +#line 3296 "DataSource.c" } -static gchar* value_source_snapshot_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_snapshot_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 3160 "DataSource.c" +#line 3308 "DataSource.c" SourceSnapshot * object; object = collect_values[0].v_pointer; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3167 "DataSource.c" +#line 3315 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.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 3171 "DataSource.c" +#line 3319 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_snapshot_ref (object); -#line 3175 "DataSource.c" +#line 3323 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3179 "DataSource.c" +#line 3327 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3183 "DataSource.c" +#line 3331 "DataSource.c" } -static gchar* value_source_snapshot_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_snapshot_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceSnapshot ** object_p; object_p = collect_values[0].v_pointer; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3194 "DataSource.c" +#line 3347 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 3200 "DataSource.c" +#line 3353 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 3204 "DataSource.c" +#line 3357 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_snapshot_ref (value->data[0].v_pointer); -#line 3208 "DataSource.c" +#line 3361 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3212 "DataSource.c" +#line 3365 "DataSource.c" } -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceSnapshot* spec; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_SNAPSHOT), NULL); @@ -3223,20 +3382,25 @@ GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 3226 "DataSource.c" +#line 3385 "DataSource.c" } -gpointer value_get_source_snapshot (const GValue* value) { +gpointer +value_get_source_snapshot (const GValue* value) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT), NULL); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3235 "DataSource.c" +#line 3396 "DataSource.c" } -void value_set_source_snapshot (GValue* value, gpointer v_object) { +void +value_set_source_snapshot (GValue* value, + gpointer v_object) +{ SourceSnapshot * old; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT)); @@ -3252,22 +3416,25 @@ void value_set_source_snapshot (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_ref (value->data[0].v_pointer); -#line 3255 "DataSource.c" +#line 3419 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3259 "DataSource.c" +#line 3423 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (old); -#line 3265 "DataSource.c" +#line 3429 "DataSource.c" } } -void value_take_source_snapshot (GValue* value, gpointer v_object) { +void +value_take_source_snapshot (GValue* value, + gpointer v_object) +{ SourceSnapshot * old; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT)); @@ -3281,22 +3448,24 @@ void value_take_source_snapshot (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 3284 "DataSource.c" +#line 3451 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3288 "DataSource.c" +#line 3455 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_unref (old); -#line 3294 "DataSource.c" +#line 3461 "DataSource.c" } } -static void source_snapshot_class_init (SourceSnapshotClass * klass) { +static void +source_snapshot_class_init (SourceSnapshotClass * klass) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_parent_class = g_type_class_peek_parent (klass); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3309,32 +3478,38 @@ static void source_snapshot_class_init (SourceSnapshotClass * klass) { ((SourceSnapshotClass *) klass)->broken = source_snapshot_real_broken; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_SNAPSHOT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceSnapshotClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3312 "DataSource.c" +#line 3481 "DataSource.c" } -static void source_snapshot_instance_init (SourceSnapshot * self) { +static void +source_snapshot_instance_init (SourceSnapshot * self) +{ #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = SOURCE_SNAPSHOT_GET_PRIVATE (self); #line 447 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->snapshot_broken = FALSE; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3323 "DataSource.c" +#line 3494 "DataSource.c" } -static void source_snapshot_finalize (SourceSnapshot * obj) { +static void +source_snapshot_finalize (SourceSnapshot * obj) +{ SourceSnapshot * self; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_SNAPSHOT, SourceSnapshot); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_handlers_destroy (self); -#line 3333 "DataSource.c" +#line 3506 "DataSource.c" } -GType source_snapshot_get_type (void) { +GType +source_snapshot_get_type (void) +{ static volatile gsize source_snapshot_type_id__volatile = 0; if (g_once_init_enter (&source_snapshot_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_snapshot_init, value_source_snapshot_free_value, value_source_snapshot_copy_value, value_source_snapshot_peek_pointer, "p", value_source_snapshot_collect_value, "p", value_source_snapshot_lcopy_value }; @@ -3348,18 +3523,22 @@ GType source_snapshot_get_type (void) { } -gpointer source_snapshot_ref (gpointer instance) { +gpointer +source_snapshot_ref (gpointer instance) +{ SourceSnapshot * self; self = instance; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 3358 "DataSource.c" +#line 3535 "DataSource.c" } -void source_snapshot_unref (gpointer instance) { +void +source_snapshot_unref (gpointer instance) +{ SourceSnapshot * self; self = instance; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3368,43 +3547,44 @@ void source_snapshot_unref (gpointer instance) { SOURCE_SNAPSHOT_GET_CLASS (self)->finalize (self); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3371 "DataSource.c" +#line 3550 "DataSource.c" } } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3395 "DataSource.c" +#line 3576 "DataSource.c" } -SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, const gchar* value) { +SourceBacklink* +source_backlink_construct (GType object_type, + const gchar* name, + const gchar* value) +{ SourceBacklink* self = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp0_; + gchar* _tmp1_; #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (name != NULL, NULL); #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3412,188 +3592,159 @@ SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceBacklink*) g_type_create_instance (object_type); #line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = name; -#line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = value; -#line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = source_backlink_validate_name_value (_tmp0_, _tmp1_); -#line 499 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp2_, "validate_name_value(name, value)"); + _vala_assert (source_backlink_validate_name_value (name, value), "validate_name_value(name, value)"); #line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = name; -#line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = string_strip (_tmp3_); + _tmp0_ = string_strip (name); #line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_name); #line 501 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_name = _tmp4_; -#line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = value; + self->priv->_name = _tmp0_; #line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = string_strip (_tmp5_); + _tmp1_ = string_strip (value); #line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_value); #line 502 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_value = _tmp6_; + self->priv->_value = _tmp1_; #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3440 "DataSource.c" +#line 3610 "DataSource.c" } -SourceBacklink* source_backlink_new (const gchar* name, const gchar* value) { +SourceBacklink* +source_backlink_new (const gchar* name, + const gchar* value) +{ #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" return source_backlink_construct (TYPE_SOURCE_BACKLINK, name, value); -#line 3447 "DataSource.c" +#line 3620 "DataSource.c" } -SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source) { +SourceBacklink* +source_backlink_construct_from_source (GType object_type, + DataSource* source) +{ SourceBacklink* self = NULL; - DataSource* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - DataSource* _tmp4_; - gint64 _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceBacklink*) g_type_create_instance (object_type); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = data_source_get_typename (_tmp0_); + _tmp0_ = data_source_get_typename (source); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = string_strip (_tmp2_); + _tmp2_ = string_strip (_tmp1_); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_name); #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_name = _tmp3_; + self->priv->_name = _tmp2_; #line 506 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp2_); -#line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = source; -#line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = data_source_get_instance_id (_tmp4_); + _g_free0 (_tmp1_); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp5_); + _tmp3_ = g_strdup_printf ("%" G_GINT64_FORMAT, data_source_get_instance_id (source)); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = string_strip (_tmp7_); + _tmp5_ = string_strip (_tmp4_); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_value); #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->_value = _tmp8_; + self->priv->_value = _tmp5_; #line 507 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->_name; + _tmp6_ = self->priv->_name; #line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = self->priv->_value; + _tmp7_ = self->priv->_value; #line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = source_backlink_validate_name_value (_tmp9_, _tmp10_); -#line 509 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp11_, "validate_name_value(_name, _value)"); + _vala_assert (source_backlink_validate_name_value (_tmp6_, _tmp7_), "validate_name_value(_name, _value)"); #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3509 "DataSource.c" +#line 3673 "DataSource.c" } -SourceBacklink* source_backlink_new_from_source (DataSource* source) { +SourceBacklink* +source_backlink_new_from_source (DataSource* source) +{ #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" return source_backlink_construct_from_source (TYPE_SOURCE_BACKLINK, source); -#line 3516 "DataSource.c" +#line 3682 "DataSource.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3536 "DataSource.c" +#line 3702 "DataSource.c" } -static gboolean source_backlink_validate_name_value (const gchar* name, const gchar* value) { +static gboolean +source_backlink_validate_name_value (const gchar* name, + const gchar* value) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_; - gboolean _tmp3_; #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (name != NULL, FALSE); #line 512 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (value != NULL, FALSE); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = name; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = string_contains (_tmp2_, "="); -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp3_) { -#line 3556 "DataSource.c" - const gchar* _tmp4_; - gboolean _tmp5_; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = name; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = string_contains (_tmp4_, "|"); + if (!string_contains (name, "=")) { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = !_tmp5_; -#line 3565 "DataSource.c" + _tmp1_ = !string_contains (name, "|"); +#line 3721 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; -#line 3569 "DataSource.c" +#line 3725 "DataSource.c" } #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_) { -#line 3573 "DataSource.c" - const gchar* _tmp6_; - gboolean _tmp7_; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = value; -#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = string_contains (_tmp6_, "|"); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = !_tmp7_; -#line 3582 "DataSource.c" + _tmp0_ = !string_contains (value, "|"); +#line 3731 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3586 "DataSource.c" +#line 3735 "DataSource.c" } #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp0_; #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3592 "DataSource.c" +#line 3741 "DataSource.c" } -gchar* source_backlink_to_string (SourceBacklink* self) { +gchar* +source_backlink_to_string (SourceBacklink* self) +{ gchar* result = NULL; const gchar* _tmp0_; const gchar* _tmp1_; @@ -3616,55 +3767,45 @@ gchar* source_backlink_to_string (SourceBacklink* self) { result = _tmp4_; #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3619 "DataSource.c" +#line 3770 "DataSource.c" } -guint source_backlink_hash_func (SourceBacklink* backlink) { +guint +source_backlink_hash_func (SourceBacklink* backlink) +{ guint result = 0U; GHashFunc _tmp0_; - SourceBacklink* _tmp1_; - const gchar* _tmp2_; - guint _tmp3_; - GHashFunc _tmp4_; - SourceBacklink* _tmp5_; - const gchar* _tmp6_; - guint _tmp7_; + const gchar* _tmp1_; + GHashFunc _tmp2_; + const gchar* _tmp3_; #line 520 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((backlink == NULL) || IS_SOURCE_BACKLINK (backlink), 0U); #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = g_str_hash; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = backlink; -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = _tmp1_->priv->_name; -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = _tmp0_ (_tmp2_); -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = g_str_hash; + _tmp1_ = backlink->priv->_name; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = backlink; + _tmp2_ = g_str_hash; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _tmp5_->priv->_value; + _tmp3_ = backlink->priv->_value; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = _tmp4_ (_tmp6_); -#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp3_ ^ _tmp7_; + result = _tmp0_ (_tmp1_) ^ _tmp2_ (_tmp3_); #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3655 "DataSource.c" +#line 3796 "DataSource.c" } -gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink) { +gboolean +source_backlink_equal_func (SourceBacklink* alink, + SourceBacklink* blink) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GEqualFunc _tmp1_; - SourceBacklink* _tmp2_; + const gchar* _tmp2_; const gchar* _tmp3_; - SourceBacklink* _tmp4_; - const gchar* _tmp5_; - gboolean _tmp6_; #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail ((alink == NULL) || IS_SOURCE_BACKLINK (alink), FALSE); #line 524 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3672,53 +3813,40 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = g_str_equal; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = alink; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = _tmp2_->priv->_name; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = blink; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _tmp4_->priv->_name; + _tmp2_ = alink->priv->_name; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = _tmp1_ (_tmp3_, _tmp5_); + _tmp3_ = blink->priv->_name; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp6_) { -#line 3686 "DataSource.c" - GEqualFunc _tmp7_; - SourceBacklink* _tmp8_; - const gchar* _tmp9_; - SourceBacklink* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = g_str_equal; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = alink; -#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = _tmp8_->priv->_value; + if (_tmp1_ (_tmp2_, _tmp3_)) { +#line 3821 "DataSource.c" + GEqualFunc _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = blink; + _tmp4_ = g_str_equal; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _tmp10_->priv->_value; + _tmp5_ = alink->priv->_value; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = _tmp7_ (_tmp9_, _tmp11_); + _tmp6_ = blink->priv->_value; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = _tmp12_; -#line 3707 "DataSource.c" + _tmp0_ = _tmp4_ (_tmp5_, _tmp6_); +#line 3833 "DataSource.c" } else { #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3711 "DataSource.c" +#line 3837 "DataSource.c" } #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp0_; #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3717 "DataSource.c" +#line 3843 "DataSource.c" } -const gchar* source_backlink_get_name (SourceBacklink* self) { +const gchar* +source_backlink_get_name (SourceBacklink* self) +{ const gchar* result; const gchar* _tmp0_; #line 473 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3729,11 +3857,13 @@ const gchar* source_backlink_get_name (SourceBacklink* self) { result = _tmp0_; #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3732 "DataSource.c" +#line 3860 "DataSource.c" } -const gchar* source_backlink_get_value (SourceBacklink* self) { +const gchar* +source_backlink_get_value (SourceBacklink* self) +{ const gchar* result; const gchar* _tmp0_; #line 479 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3744,11 +3874,13 @@ const gchar* source_backlink_get_value (SourceBacklink* self) { result = _tmp0_; #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3747 "DataSource.c" +#line 3877 "DataSource.c" } -const gchar* source_backlink_get_typename (SourceBacklink* self) { +const gchar* +source_backlink_get_typename (SourceBacklink* self) +{ const gchar* result; const gchar* _tmp0_; #line 486 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3759,144 +3891,167 @@ const gchar* source_backlink_get_typename (SourceBacklink* self) { result = _tmp0_; #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3762 "DataSource.c" +#line 3894 "DataSource.c" } -static gint64 int64_parse (const gchar* str) { +static gint64 +int64_parse (const gchar* str) +{ gint64 result = 0LL; - const gchar* _tmp0_; - gint64 _tmp1_; -#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gint64 _tmp0_; +#line 687 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_ascii_strtoll (str, NULL, (guint) 0); +#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3780 "DataSource.c" +#line 3911 "DataSource.c" } -gint64 source_backlink_get_instance_id (SourceBacklink* self) { +gint64 +source_backlink_get_instance_id (SourceBacklink* self) +{ gint64 result; const gchar* _tmp0_; - gint64 _tmp1_; #line 493 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), 0LL); #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->_value; #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = int64_parse (_tmp0_); -#line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp1_; + result = int64_parse (_tmp0_); #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3798 "DataSource.c" +#line 3928 "DataSource.c" } -static void value_source_backlink_init (GValue* value) { +static void +value_source_backlink_init (GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3805 "DataSource.c" +#line 3937 "DataSource.c" } -static void value_source_backlink_free_value (GValue* value) { +static void +value_source_backlink_free_value (GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (value->data[0].v_pointer); -#line 3814 "DataSource.c" +#line 3948 "DataSource.c" } } -static void value_source_backlink_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_backlink_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (src_value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_backlink_ref (src_value->data[0].v_pointer); -#line 3824 "DataSource.c" +#line 3961 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3828 "DataSource.c" +#line 3965 "DataSource.c" } } -static gpointer value_source_backlink_peek_pointer (const GValue* value) { +static gpointer +value_source_backlink_peek_pointer (const GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3836 "DataSource.c" +#line 3975 "DataSource.c" } -static gchar* value_source_backlink_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_backlink_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 3843 "DataSource.c" +#line 3987 "DataSource.c" SourceBacklink * object; object = collect_values[0].v_pointer; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3850 "DataSource.c" +#line 3994 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.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 3854 "DataSource.c" +#line 3998 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_backlink_ref (object); -#line 3858 "DataSource.c" +#line 4002 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3862 "DataSource.c" +#line 4006 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3866 "DataSource.c" +#line 4010 "DataSource.c" } -static gchar* value_source_backlink_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_backlink_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceBacklink ** object_p; object_p = collect_values[0].v_pointer; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3877 "DataSource.c" +#line 4026 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 3883 "DataSource.c" +#line 4032 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 3887 "DataSource.c" +#line 4036 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_backlink_ref (value->data[0].v_pointer); -#line 3891 "DataSource.c" +#line 4040 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3895 "DataSource.c" +#line 4044 "DataSource.c" } -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceBacklink* spec; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_BACKLINK), NULL); @@ -3906,20 +4061,25 @@ GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 3909 "DataSource.c" +#line 4064 "DataSource.c" } -gpointer value_get_source_backlink (const GValue* value) { +gpointer +value_get_source_backlink (const GValue* value) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK), NULL); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 3918 "DataSource.c" +#line 4075 "DataSource.c" } -void value_set_source_backlink (GValue* value, gpointer v_object) { +void +value_set_source_backlink (GValue* value, + gpointer v_object) +{ SourceBacklink * old; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK)); @@ -3935,22 +4095,25 @@ void value_set_source_backlink (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_ref (value->data[0].v_pointer); -#line 3938 "DataSource.c" +#line 4098 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3942 "DataSource.c" +#line 4102 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (old); -#line 3948 "DataSource.c" +#line 4108 "DataSource.c" } } -void value_take_source_backlink (GValue* value, gpointer v_object) { +void +value_take_source_backlink (GValue* value, + gpointer v_object) +{ SourceBacklink * old; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK)); @@ -3964,42 +4127,48 @@ void value_take_source_backlink (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 3967 "DataSource.c" +#line 4130 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3971 "DataSource.c" +#line 4134 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_unref (old); -#line 3977 "DataSource.c" +#line 4140 "DataSource.c" } } -static void source_backlink_class_init (SourceBacklinkClass * klass) { +static void +source_backlink_class_init (SourceBacklinkClass * klass) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_backlink_parent_class = g_type_class_peek_parent (klass); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceBacklinkClass *) klass)->finalize = source_backlink_finalize; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (SourceBacklinkPrivate)); -#line 3989 "DataSource.c" +#line 4154 "DataSource.c" } -static void source_backlink_instance_init (SourceBacklink * self) { +static void +source_backlink_instance_init (SourceBacklink * self) +{ #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = SOURCE_BACKLINK_GET_PRIVATE (self); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3998 "DataSource.c" +#line 4165 "DataSource.c" } -static void source_backlink_finalize (SourceBacklink * obj) { +static void +source_backlink_finalize (SourceBacklink * obj) +{ SourceBacklink * self; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_BACKLINK, SourceBacklink); @@ -4009,11 +4178,13 @@ static void source_backlink_finalize (SourceBacklink * obj) { _g_free0 (self->priv->_name); #line 470 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->_value); -#line 4012 "DataSource.c" +#line 4181 "DataSource.c" } -GType source_backlink_get_type (void) { +GType +source_backlink_get_type (void) +{ static volatile gsize source_backlink_type_id__volatile = 0; if (g_once_init_enter (&source_backlink_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_backlink_init, value_source_backlink_free_value, value_source_backlink_copy_value, value_source_backlink_peek_pointer, "p", value_source_backlink_collect_value, "p", value_source_backlink_lcopy_value }; @@ -4027,18 +4198,22 @@ GType source_backlink_get_type (void) { } -gpointer source_backlink_ref (gpointer instance) { +gpointer +source_backlink_ref (gpointer instance) +{ SourceBacklink * self; self = instance; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 4037 "DataSource.c" +#line 4210 "DataSource.c" } -void source_backlink_unref (gpointer instance) { +void +source_backlink_unref (gpointer instance) +{ SourceBacklink * self; self = instance; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4047,193 +4222,210 @@ void source_backlink_unref (gpointer instance) { SOURCE_BACKLINK_GET_CLASS (self)->finalize (self); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4050 "DataSource.c" +#line 4225 "DataSource.c" } } -static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 588 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_source_added ((SourceProxy*) self, added); -#line 4058 "DataSource.c" +#line 4237 "DataSource.c" } -static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, gpointer self) { +static void +_source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, + gpointer self) +{ #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_snapshot_broken ((SourceProxy*) self); -#line 4065 "DataSource.c" +#line 4247 "DataSource.c" } -SourceProxy* source_proxy_construct (GType object_type, DataSource* source) { +SourceProxy* +source_proxy_construct (GType object_type, + DataSource* source) +{ SourceProxy* self = NULL; - DataSource* _tmp0_; - gint64 _tmp1_; - DataSource* _tmp2_; - gchar* _tmp3_; - DataSource* _tmp4_; - SourceSnapshot* _tmp5_; - SourceSnapshot* _tmp6_; - SourceSnapshot* _tmp7_; - DataSource* _tmp8_; - DataSource* _tmp9_; - DataCollection* _tmp10_; - SourceCollection* _tmp11_; - SourceCollection* _tmp12_; + gchar* _tmp0_; + SourceSnapshot* _tmp1_; + SourceSnapshot* _tmp2_; + SourceSnapshot* _tmp3_; + DataCollection* _tmp4_; + SourceCollection* _tmp5_; + SourceCollection* _tmp6_; #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = (SourceProxy*) g_type_create_instance (object_type); #line 572 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 572 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 572 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->object_id = _tmp1_; -#line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = source; + self->priv->object_id = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (self->priv->source_string); #line 573 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->source_string = _tmp3_; -#line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = source; + self->priv->source_string = _tmp0_; #line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = data_source_save_snapshot (_tmp4_); + _tmp1_ = data_source_save_snapshot (source); #line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" _source_snapshot_unref0 (self->priv->snapshot); #line 575 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->snapshot = _tmp5_; + self->priv->snapshot = _tmp1_; #line 576 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = self->priv->snapshot; + _tmp2_ = self->priv->snapshot; #line 576 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp6_ != NULL, "snapshot != null"); + _vala_assert (_tmp2_ != NULL, "snapshot != null"); #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = self->priv->snapshot; + _tmp3_ = self->priv->snapshot; #line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_connect (_tmp7_, "broken", (GCallback) _source_proxy_on_snapshot_broken_source_snapshot_broken, self); + g_signal_connect (_tmp3_, "broken", (GCallback) _source_proxy_on_snapshot_broken_source_snapshot_broken, self); #line 579 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = source; -#line 579 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_proxy_set_source (self, _tmp8_); -#line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = source; + source_proxy_set_source (self, source); #line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (self->priv->membership); #line 581 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->membership = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection); + self->priv->membership = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection); #line 582 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = self->priv->membership; + _tmp5_ = self->priv->membership; #line 582 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp11_ != NULL, "membership != null"); + _vala_assert (_tmp5_ != NULL, "membership != null"); #line 583 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = self->priv->membership; + _tmp6_ = self->priv->membership; #line 583 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _source_proxy_on_source_added_data_collection_items_added, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _source_proxy_on_source_added_data_collection_items_added, self); #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 4140 "DataSource.c" +#line 4307 "DataSource.c" } -static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot) { +static DataSource* +source_proxy_real_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot) +{ #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_critical ("Type `%s' does not implement abstract method `source_proxy_reconstitute'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4149 "DataSource.c" +#line 4320 "DataSource.c" } -DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, SourceSnapshot* snapshot) { +DataSource* +source_proxy_reconstitute (SourceProxy* self, + gint64 object_id, + SourceSnapshot* snapshot) +{ #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL); #line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala" return SOURCE_PROXY_GET_CLASS (self)->reconstitute (self, object_id, snapshot); -#line 4158 "DataSource.c" +#line 4333 "DataSource.c" } -static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSource* source) { - DataSource* _tmp0_; +static void +source_proxy_real_notify_reconstituted (SourceProxy* self, + DataSource* source) +{ #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL], 0, _tmp0_); -#line 4170 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL], 0, source); +#line 4345 "DataSource.c" } -void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source) { +void +source_proxy_notify_reconstituted (SourceProxy* self, + DataSource* source) +{ #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_reconstituted (self, source); -#line 4179 "DataSource.c" +#line 4357 "DataSource.c" } -static void source_proxy_real_notify_dehydrated (SourceProxy* self) { +static void +source_proxy_real_notify_dehydrated (SourceProxy* self) +{ #line 598 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL], 0); -#line 4186 "DataSource.c" +#line 4366 "DataSource.c" } -void source_proxy_notify_dehydrated (SourceProxy* self) { +void +source_proxy_notify_dehydrated (SourceProxy* self) +{ #line 597 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 597 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_dehydrated (self); -#line 4195 "DataSource.c" +#line 4377 "DataSource.c" } -static void source_proxy_real_notify_broken (SourceProxy* self) { +static void +source_proxy_real_notify_broken (SourceProxy* self) +{ #line 602 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL], 0); -#line 4202 "DataSource.c" +#line 4386 "DataSource.c" } -void source_proxy_notify_broken (SourceProxy* self) { +void +source_proxy_notify_broken (SourceProxy* self) +{ #line 601 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 601 "/home/jens/Source/shotwell/src/core/DataSource.vala" SOURCE_PROXY_GET_CLASS (self)->notify_broken (self); -#line 4211 "DataSource.c" +#line 4397 "DataSource.c" } -static void source_proxy_on_snapshot_broken (SourceProxy* self) { +static void +source_proxy_on_snapshot_broken (SourceProxy* self) +{ #line 605 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 606 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_drop_source (self); #line 608 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_notify_broken (self); -#line 4222 "DataSource.c" +#line 4410 "DataSource.c" } -static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) { +static void +_source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, + gpointer self) +{ #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_on_destroyed ((SourceProxy*) self); -#line 4229 "DataSource.c" +#line 4420 "DataSource.c" } -static void source_proxy_set_source (SourceProxy* self, DataSource* source) { +static void +source_proxy_set_source (SourceProxy* self, + DataSource* source) +{ DataSource* _tmp0_; - DataSource* _tmp1_; - DataSource* _tmp2_; #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 611 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4241,22 +4433,20 @@ static void source_proxy_set_source (SourceProxy* self, DataSource* source) { #line 612 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_drop_source (self); #line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp0_ = source; -#line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (source); #line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->source); #line 614 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->source = _tmp1_; + self->priv->source = _tmp0_; #line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = source; -#line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_connect (_tmp2_, "destroyed", (GCallback) _source_proxy_on_destroyed_data_source_destroyed, self); -#line 4255 "DataSource.c" + g_signal_connect (source, "destroyed", (GCallback) _source_proxy_on_destroyed_data_source_destroyed, self); +#line 4443 "DataSource.c" } -static void source_proxy_drop_source (SourceProxy* self) { +static void +source_proxy_drop_source (SourceProxy* self) +{ DataSource* _tmp0_; DataSource* _tmp1_; guint _tmp2_; @@ -4268,7 +4458,7 @@ static void source_proxy_drop_source (SourceProxy* self) { if (_tmp0_ == NULL) { #line 620 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 4271 "DataSource.c" +#line 4461 "DataSource.c" } #line 622 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->source; @@ -4280,140 +4470,129 @@ static void source_proxy_drop_source (SourceProxy* self) { _g_object_unref0 (self->priv->source); #line 623 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->source = NULL; -#line 4283 "DataSource.c" +#line 4473 "DataSource.c" } -DataSource* source_proxy_get_source (SourceProxy* self) { +DataSource* +source_proxy_get_source (SourceProxy* self) +{ DataSource* result = NULL; SourceSnapshot* _tmp0_; - gboolean _tmp1_; - DataSource* _tmp2_; + DataSource* _tmp1_; DataSource* new_source = NULL; - gint64 _tmp5_; - SourceSnapshot* _tmp6_; + gint64 _tmp4_; + SourceSnapshot* _tmp5_; + DataSource* _tmp6_; DataSource* _tmp7_; DataSource* _tmp8_; - DataSource* _tmp9_; - gint64 _tmp12_; - DataSource* _tmp13_; - gint64 _tmp14_; + gint64 _tmp11_; + DataSource* _tmp12_; + DataSource* _tmp14_; + gint64 _tmp15_; + SourceCollection* _tmp16_; DataSource* _tmp17_; - gint64 _tmp18_; - gint64 _tmp19_; - SourceCollection* _tmp20_; - DataSource* _tmp21_; - gboolean _tmp22_; - DataSource* _tmp23_; - DataSource* _tmp24_; + DataSource* _tmp18_; + DataSource* _tmp19_; #line 626 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL); #line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->snapshot; #line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = source_snapshot_is_broken (_tmp0_); -#line 627 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp1_) { + if (source_snapshot_is_broken (_tmp0_)) { #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = NULL; #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4321 "DataSource.c" +#line 4507 "DataSource.c" } #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = self->priv->source; + _tmp1_ = self->priv->source; #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp2_ != NULL) { -#line 4327 "DataSource.c" + if (_tmp1_ != NULL) { +#line 4513 "DataSource.c" + DataSource* _tmp2_; DataSource* _tmp3_; - DataSource* _tmp4_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = self->priv->source; + _tmp2_ = self->priv->source; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp4_; + result = _tmp3_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4338 "DataSource.c" +#line 4524 "DataSource.c" } #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = self->priv->object_id; + _tmp4_ = self->priv->object_id; #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = self->priv->snapshot; + _tmp5_ = self->priv->snapshot; #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = source_proxy_reconstitute (self, _tmp5_, _tmp6_); + _tmp6_ = source_proxy_reconstitute (self, _tmp4_, _tmp5_); #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" - new_source = _tmp7_; + new_source = _tmp6_; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = self->priv->source; + _tmp7_ = self->priv->source; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = new_source; + _tmp8_ = new_source; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp8_ != _tmp9_) { -#line 4354 "DataSource.c" + if (_tmp7_ != _tmp8_) { +#line 4540 "DataSource.c" + DataSource* _tmp9_; DataSource* _tmp10_; - DataSource* _tmp11_; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = new_source; + _tmp9_ = new_source; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = _g_object_ref0 (_tmp10_); + _tmp10_ = _g_object_ref0 (_tmp9_); #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (self->priv->source); #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->source = _tmp11_; -#line 4365 "DataSource.c" + self->priv->source = _tmp10_; +#line 4551 "DataSource.c" } #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp12_ = self->priv->object_id; -#line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp13_ = self->priv->source; + _tmp11_ = self->priv->object_id; #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp14_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = self->priv->source; #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp12_ != _tmp14_) { -#line 4375 "DataSource.c" - DataSource* _tmp15_; - gint64 _tmp16_; + if (_tmp11_ != data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject))) { +#line 4559 "DataSource.c" + DataSource* _tmp13_; #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp15_ = new_source; + _tmp13_ = new_source; #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp16_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)); -#line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" - self->priv->object_id = _tmp16_; -#line 4384 "DataSource.c" + self->priv->object_id = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); +#line 4565 "DataSource.c" } #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp17_ = self->priv->source; -#line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp18_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); + _tmp14_ = self->priv->source; #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp19_ = self->priv->object_id; + _tmp15_ = self->priv->object_id; #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp18_ == _tmp19_, "source.get_object_id() == object_id"); -#line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp20_ = self->priv->membership; + _vala_assert (data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)) == _tmp15_, "source.get_object_id() == object_id"); #line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp21_ = self->priv->source; + _tmp16_ = self->priv->membership; #line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp22_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject)); + _tmp17_ = self->priv->source; #line 642 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _vala_assert (_tmp22_, "membership.contains(source)"); + _vala_assert (data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)), "membership.contains(source)"); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp23_ = self->priv->source; + _tmp18_ = self->priv->source; #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp24_ = _g_object_ref0 (_tmp23_); + _tmp19_ = _g_object_ref0 (_tmp18_); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" - result = _tmp24_; + result = _tmp19_; #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (new_source); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4412 "DataSource.c" +#line 4589 "DataSource.c" } -static void source_proxy_on_destroyed (SourceProxy* self) { +static void +source_proxy_on_destroyed (SourceProxy* self) +{ DataSource* _tmp0_; #line 647 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); @@ -4425,11 +4604,14 @@ static void source_proxy_on_destroyed (SourceProxy* self) { source_proxy_drop_source (self); #line 653 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_notify_dehydrated (self); -#line 4428 "DataSource.c" +#line 4607 "DataSource.c" } -static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) { +static void +source_proxy_on_source_added (SourceProxy* self, + GeeIterable* added) +{ DataSource* _tmp0_; #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); @@ -4441,195 +4623,218 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) if (_tmp0_ != NULL) { #line 659 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 4444 "DataSource.c" +#line 4626 "DataSource.c" } { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp1_ = added; + _tmp1_ = gee_iterable_iterator (added); #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 4458 "DataSource.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 4637 "DataSource.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + DataObject* _tmp5_; + gint64 _tmp6_; DataObject* _tmp7_; - gint64 _tmp8_; - gint64 _tmp9_; - DataObject* _tmp10_; - DataObject* _tmp11_; -#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp3_ = _object_it; + DataObject* _tmp8_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4477 "DataSource.c" +#line 4652 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp7_ = object; + _tmp5_ = object; #line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp8_ = data_object_get_object_id (_tmp7_); + _tmp6_ = self->priv->object_id; #line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp9_ = self->priv->object_id; -#line 663 "/home/jens/Source/shotwell/src/core/DataSource.vala" - if (_tmp8_ != _tmp9_) { + if (data_object_get_object_id (_tmp5_) != _tmp6_) { #line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (object); #line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 4497 "DataSource.c" +#line 4670 "DataSource.c" } #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp10_ = object; + _tmp7_ = object; #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_proxy_set_source (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); + source_proxy_set_source (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); #line 669 "/home/jens/Source/shotwell/src/core/DataSource.vala" - _tmp11_ = object; + _tmp8_ = object; #line 669 "/home/jens/Source/shotwell/src/core/DataSource.vala" - source_proxy_notify_reconstituted (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource)); + source_proxy_notify_reconstituted (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); #line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (object); #line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4511 "DataSource.c" +#line 4684 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_object_it); -#line 4515 "DataSource.c" +#line 4688 "DataSource.c" } } -static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source) { +static void +source_proxy_real_reconstituted (SourceProxy* self, + DataSource* source) +{ #line 558 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 4523 "DataSource.c" +#line 4699 "DataSource.c" } -static void source_proxy_real_dehydrated (SourceProxy* self) { +static void +source_proxy_real_dehydrated (SourceProxy* self) +{ } -static void source_proxy_real_broken (SourceProxy* self) { +static void +source_proxy_real_broken (SourceProxy* self) +{ } -static void value_source_proxy_init (GValue* value) { +static void +value_source_proxy_init (GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4538 "DataSource.c" +#line 4720 "DataSource.c" } -static void value_source_proxy_free_value (GValue* value) { +static void +value_source_proxy_free_value (GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (value->data[0].v_pointer); -#line 4547 "DataSource.c" +#line 4731 "DataSource.c" } } -static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_proxy_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (src_value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = source_proxy_ref (src_value->data[0].v_pointer); -#line 4557 "DataSource.c" +#line 4744 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 4561 "DataSource.c" +#line 4748 "DataSource.c" } } -static gpointer value_source_proxy_peek_pointer (const GValue* value) { +static gpointer +value_source_proxy_peek_pointer (const GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 4569 "DataSource.c" +#line 4758 "DataSource.c" } -static gchar* value_source_proxy_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_proxy_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (collect_values[0].v_pointer) { -#line 4576 "DataSource.c" +#line 4770 "DataSource.c" SourceProxy * object; object = collect_values[0].v_pointer; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (object->parent_instance.g_class == NULL) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4583 "DataSource.c" +#line 4777 "DataSource.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.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 4587 "DataSource.c" +#line 4781 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_proxy_ref (object); -#line 4591 "DataSource.c" +#line 4785 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4595 "DataSource.c" +#line 4789 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4599 "DataSource.c" +#line 4793 "DataSource.c" } -static gchar* value_source_proxy_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_proxy_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceProxy ** object_p; object_p = collect_values[0].v_pointer; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!object_p) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4610 "DataSource.c" +#line 4809 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!value->data[0].v_pointer) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = NULL; -#line 4616 "DataSource.c" +#line 4815 "DataSource.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = value->data[0].v_pointer; -#line 4620 "DataSource.c" +#line 4819 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_proxy_ref (value->data[0].v_pointer); -#line 4624 "DataSource.c" +#line 4823 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4628 "DataSource.c" +#line 4827 "DataSource.c" } -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceProxy* spec; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_PROXY), NULL); @@ -4639,20 +4844,25 @@ GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return G_PARAM_SPEC (spec); -#line 4642 "DataSource.c" +#line 4847 "DataSource.c" } -gpointer value_get_source_proxy (const GValue* value) { +gpointer +value_get_source_proxy (const GValue* value) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY), NULL); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return value->data[0].v_pointer; -#line 4651 "DataSource.c" +#line 4858 "DataSource.c" } -void value_set_source_proxy (GValue* value, gpointer v_object) { +void +value_set_source_proxy (GValue* value, + gpointer v_object) +{ SourceProxy * old; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY)); @@ -4668,22 +4878,25 @@ void value_set_source_proxy (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_ref (value->data[0].v_pointer); -#line 4671 "DataSource.c" +#line 4881 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4675 "DataSource.c" +#line 4885 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (old); -#line 4681 "DataSource.c" +#line 4891 "DataSource.c" } } -void value_take_source_proxy (GValue* value, gpointer v_object) { +void +value_take_source_proxy (GValue* value, + gpointer v_object) +{ SourceProxy * old; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY)); @@ -4697,22 +4910,24 @@ void value_take_source_proxy (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = v_object; -#line 4700 "DataSource.c" +#line 4913 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4704 "DataSource.c" +#line 4917 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (old) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_unref (old); -#line 4710 "DataSource.c" +#line 4923 "DataSource.c" } } -static void source_proxy_class_init (SourceProxyClass * klass) { +static void +source_proxy_class_init (SourceProxyClass * klass) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_parent_class = g_type_class_peek_parent (klass); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4739,20 +4954,24 @@ static void source_proxy_class_init (SourceProxyClass * klass) { source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL] = g_signal_new ("dehydrated", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, dehydrated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4742 "DataSource.c" +#line 4957 "DataSource.c" } -static void source_proxy_instance_init (SourceProxy * self) { +static void +source_proxy_instance_init (SourceProxy * self) +{ #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = SOURCE_PROXY_GET_PRIVATE (self); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 4751 "DataSource.c" +#line 4968 "DataSource.c" } -static void source_proxy_finalize (SourceProxy * obj) { +static void +source_proxy_finalize (SourceProxy * obj) +{ SourceProxy * self; SourceCollection* _tmp0_; guint _tmp1_; @@ -4776,11 +4995,13 @@ static void source_proxy_finalize (SourceProxy * obj) { _source_snapshot_unref0 (self->priv->snapshot); #line 554 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (self->priv->membership); -#line 4779 "DataSource.c" +#line 4998 "DataSource.c" } -GType source_proxy_get_type (void) { +GType +source_proxy_get_type (void) +{ static volatile gsize source_proxy_type_id__volatile = 0; if (g_once_init_enter (&source_proxy_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_proxy_init, value_source_proxy_free_value, value_source_proxy_copy_value, value_source_proxy_peek_pointer, "p", value_source_proxy_collect_value, "p", value_source_proxy_lcopy_value }; @@ -4794,18 +5015,22 @@ GType source_proxy_get_type (void) { } -gpointer source_proxy_ref (gpointer instance) { +gpointer +source_proxy_ref (gpointer instance) +{ SourceProxy * self; self = instance; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_atomic_int_inc (&self->ref_count); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return instance; -#line 4804 "DataSource.c" +#line 5027 "DataSource.c" } -void source_proxy_unref (gpointer instance) { +void +source_proxy_unref (gpointer instance) +{ SourceProxy * self; self = instance; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4814,33 +5039,39 @@ void source_proxy_unref (gpointer instance) { SOURCE_PROXY_GET_CLASS (self)->finalize (self); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4817 "DataSource.c" +#line 5042 "DataSource.c" } } -SourceProxy* proxyable_get_proxy (Proxyable* self) { +SourceProxy* +proxyable_get_proxy (Proxyable* self) +{ #line 677 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_PROXYABLE (self), NULL); #line 677 "/home/jens/Source/shotwell/src/core/DataSource.vala" return PROXYABLE_GET_INTERFACE (self)->get_proxy (self); -#line 4827 "DataSource.c" +#line 5054 "DataSource.c" } -static void proxyable_base_init (ProxyableIface * iface) { +static void +proxyable_base_init (ProxyableIface * iface) +{ #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" static gboolean initialized = FALSE; #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!initialized) { #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" initialized = TRUE; -#line 4838 "DataSource.c" +#line 5067 "DataSource.c" } } -GType proxyable_get_type (void) { +GType +proxyable_get_type (void) +{ static volatile gsize proxyable_type_id__volatile = 0; if (g_once_init_enter (&proxyable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ProxyableIface), (GBaseInitFunc) proxyable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -4853,7 +5084,11 @@ GType proxyable_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -4865,13 +5100,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c index 539ab93..5fda46c 100644 --- a/src/core/DataSourceTypes.c +++ b/src/core/DataSourceTypes.c @@ -1,4 +1,4 @@ -/* DataSourceTypes.c generated by valac 0.36.6, the Vala compiler +/* DataSourceTypes.c generated by valac 0.40.4, the Vala compiler * generated from DataSourceTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -10,6 +10,7 @@ /* Media sources*/ /**/ + #include #include #include @@ -104,6 +105,11 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _ThumbnailSourcePrivate ThumbnailSourcePrivate; #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ()) +enum { + THUMBNAIL_SOURCE_0_PROPERTY, + THUMBNAIL_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* thumbnail_source_properties[THUMBNAIL_SOURCE_NUM_PROPERTIES]; #define TYPE_DATA_VIEW (data_view_get_type ()) #define DATA_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_VIEW, DataView)) @@ -126,9 +132,9 @@ typedef struct _ThumbnailView ThumbnailView; typedef struct _ThumbnailViewClass ThumbnailViewClass; enum { THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL, - THUMBNAIL_SOURCE_LAST_SIGNAL + THUMBNAIL_SOURCE_NUM_SIGNALS }; -static guint thumbnail_source_signals[THUMBNAIL_SOURCE_LAST_SIGNAL] = {0}; +static guint thumbnail_source_signals[THUMBNAIL_SOURCE_NUM_SIGNALS] = {0}; #define TYPE_INDEXABLE (indexable_get_type ()) #define INDEXABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INDEXABLE, Indexable)) @@ -207,6 +213,11 @@ typedef struct _MediaMetadataClass MediaMetadataClass; typedef struct _PhotoMetadata PhotoMetadata; typedef struct _PhotoMetadataClass PhotoMetadataClass; +enum { + PHOTO_SOURCE_0_PROPERTY, + PHOTO_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* photo_source_properties[PHOTO_SOURCE_NUM_PROPERTIES]; #define TYPE_VIDEO_SOURCE (video_source_get_type ()) #define VIDEO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE, VideoSource)) @@ -218,6 +229,11 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass; typedef struct _VideoSource VideoSource; typedef struct _VideoSourceClass VideoSourceClass; typedef struct _VideoSourcePrivate VideoSourcePrivate; +enum { + VIDEO_SOURCE_0_PROPERTY, + VIDEO_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* video_source_properties[VIDEO_SOURCE_NUM_PROPERTIES]; #define TYPE_EVENT_SOURCE (event_source_get_type ()) #define EVENT_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_SOURCE, EventSource)) @@ -229,6 +245,11 @@ typedef struct _VideoSourcePrivate VideoSourcePrivate; typedef struct _EventSource EventSource; typedef struct _EventSourceClass EventSourceClass; typedef struct _EventSourcePrivate EventSourcePrivate; +enum { + EVENT_SOURCE_0_PROPERTY, + EVENT_SOURCE_NUM_PROPERTIES +}; +static GParamSpec* event_source_properties[EVENT_SOURCE_NUM_PROPERTIES]; #define TYPE_CONTAINER_SOURCE (container_source_get_type ()) #define CONTAINER_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTAINER_SOURCE, ContainerSource)) @@ -460,53 +481,88 @@ static gpointer event_source_parent_class = NULL; 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; 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_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; -enum { - THUMBNAIL_SOURCE_DUMMY_PROPERTY -}; -ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id); -DataSource* data_source_construct (GType object_type, gint64 object_id); +ThumbnailSource* thumbnail_source_construct (GType object_type, + gint64 object_id); +DataSource* data_source_construct (GType object_type, + gint64 object_id); void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self); static void thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self); GType data_view_get_type (void) G_GNUC_CONST; -void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target); -static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, DataView* view); -static void _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, gpointer self); +void data_source_contact_subscribers (DataSource* self, + DataSourceContactSubscriber contact_subscriber, + void* contact_subscriber_target); +static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, + DataView* view); +static void _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, + gpointer self); GType thumbnail_view_get_type (void) G_GNUC_CONST; void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); -static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); -static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); gchar* thumbnail_source_get_representative_id (ThumbnailSource* self); static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self); gchar* data_source_get_source_id (DataSource* self); @@ -520,9 +576,15 @@ EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; @@ -540,32 +602,36 @@ void import_id_free (ImportID* self); GType photo_source_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; -enum { - PHOTO_SOURCE_DUMMY_PROPERTY -}; -PhotoSource* photo_source_construct (GType object_type, gint64 object_id); -MediaSource* media_source_construct (GType object_type, gint64 object_id); +PhotoSource* photo_source_construct (GType object_type, + gint64 object_id); +MediaSource* media_source_construct (GType object_type, + gint64 object_id); PhotoMetadata* photo_source_get_metadata (PhotoSource* self); static PhotoMetadata* photo_source_real_get_metadata (PhotoSource* self); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); GType video_source_get_type (void) G_GNUC_CONST; -enum { - VIDEO_SOURCE_DUMMY_PROPERTY -}; VideoSource* video_source_construct (GType object_type); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) GType event_source_get_type (void) G_GNUC_CONST; -enum { - EVENT_SOURCE_DUMMY_PROPERTY -}; -EventSource* event_source_construct (GType object_type, gint64 object_id); +EventSource* event_source_construct (GType object_type, + gint64 object_id); time_t event_source_get_start_time (EventSource* self); static time_t event_source_real_get_start_time (EventSource* self); time_t event_source_get_end_time (EventSource* self); @@ -578,113 +644,150 @@ GeeCollection* event_source_get_media (EventSource* self); static GeeCollection* event_source_real_get_media (EventSource* self); gchar* event_source_get_comment (EventSource* self); static gchar* event_source_real_get_comment (EventSource* self); -gboolean event_source_set_comment (EventSource* self, const gchar* comment); -static gboolean event_source_real_set_comment (EventSource* self, const gchar* comment); +gboolean event_source_set_comment (EventSource* self, + const gchar* comment); +static gboolean event_source_real_set_comment (EventSource* self, + const gchar* comment); gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType container_source_get_type (void) G_GNUC_CONST; gboolean container_source_has_links (ContainerSource* self); SourceBacklink* container_source_get_backlink (ContainerSource* self); -void container_source_break_link (ContainerSource* self, DataSource* source); -void container_source_break_link_many (ContainerSource* self, GeeCollection* sources); -void container_source_establish_link (ContainerSource* self, DataSource* source); -void container_source_establish_link_many (ContainerSource* self, GeeCollection* sources); - - -ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id) { +void container_source_break_link (ContainerSource* self, + DataSource* source); +void container_source_break_link_many (ContainerSource* self, + GeeCollection* sources); +void container_source_establish_link (ContainerSource* self, + DataSource* source); +void container_source_establish_link_many (ContainerSource* self, + GeeCollection* sources); + + +ThumbnailSource* +thumbnail_source_construct (GType object_type, + gint64 object_id) +{ ThumbnailSource * self = NULL; - gint64 _tmp0_; -#line 16 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = object_id; #line 16 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - self = (ThumbnailSource*) data_source_construct (object_type, _tmp0_); + self = (ThumbnailSource*) data_source_construct (object_type, object_id); #line 15 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 609 "DataSourceTypes.c" +#line 687 "DataSourceTypes.c" } -static void _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, gpointer self) { +static void +_thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber (DataView* view, + gpointer self) +{ #line 24 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" thumbnail_source_subscriber_thumbnail_altered ((ThumbnailSource*) self, view); -#line 616 "DataSourceTypes.c" +#line 697 "DataSourceTypes.c" } -static void thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self) { +static void +thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_signal_emit (self, thumbnail_source_signals[THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL], 0); #line 24 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" data_source_contact_subscribers (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), _thumbnail_source_subscriber_thumbnail_altered_data_source_contact_subscriber, self); -#line 625 "DataSourceTypes.c" +#line 708 "DataSourceTypes.c" } -void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self) { +void +thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self) +{ #line 19 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (self)); #line 19 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" THUMBNAIL_SOURCE_GET_CLASS (self)->notify_thumbnail_altered (self); -#line 634 "DataSourceTypes.c" +#line 719 "DataSourceTypes.c" } -static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, DataView* view) { - DataView* _tmp0_; +static void +thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, + DataView* view) +{ #line 27 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (self)); #line 27 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 28 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = view; -#line 28 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - thumbnail_view_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_VIEW, ThumbnailView)); -#line 648 "DataSourceTypes.c" + thumbnail_view_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_THUMBNAIL_VIEW, ThumbnailView)); +#line 733 "DataSourceTypes.c" } -static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +static GdkPixbuf* +thumbnail_source_real_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `thumbnail_source_get_thumbnail'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 657 "DataSourceTypes.c" +#line 746 "DataSourceTypes.c" } -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +GdkPixbuf* +thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL); #line 31 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->get_thumbnail (self, scale, error); -#line 666 "DataSourceTypes.c" +#line 759 "DataSourceTypes.c" } -static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +static GdkPixbuf* +thumbnail_source_real_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `thumbnail_source_create_thumbnail'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 675 "DataSourceTypes.c" +#line 772 "DataSourceTypes.c" } -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error) { +GdkPixbuf* +thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error) +{ #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL); #line 35 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->create_thumbnail (self, scale, error); -#line 684 "DataSourceTypes.c" +#line 785 "DataSourceTypes.c" } -static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self) { +static gchar* +thumbnail_source_real_get_representative_id (ThumbnailSource* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" @@ -693,42 +796,52 @@ static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self result = _tmp0_; #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return result; -#line 697 "DataSourceTypes.c" +#line 800 "DataSourceTypes.c" } -gchar* thumbnail_source_get_representative_id (ThumbnailSource* self) { +gchar* +thumbnail_source_get_representative_id (ThumbnailSource* self) +{ #line 46 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), NULL); #line 46 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->get_representative_id (self); -#line 706 "DataSourceTypes.c" +#line 811 "DataSourceTypes.c" } -static PhotoFileFormat thumbnail_source_real_get_preferred_thumbnail_format (ThumbnailSource* self) { +static PhotoFileFormat +thumbnail_source_real_get_preferred_thumbnail_format (ThumbnailSource* self) +{ #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `thumbnail_source_get_preferred_thumbnail_format'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return 0; -#line 715 "DataSourceTypes.c" +#line 822 "DataSourceTypes.c" } -PhotoFileFormat thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource* self) { +PhotoFileFormat +thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource* self) +{ #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (self), 0); #line 50 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return THUMBNAIL_SOURCE_GET_CLASS (self)->get_preferred_thumbnail_format (self); -#line 724 "DataSourceTypes.c" +#line 833 "DataSourceTypes.c" } -static void thumbnail_source_real_thumbnail_altered (ThumbnailSource* self) { +static void +thumbnail_source_real_thumbnail_altered (ThumbnailSource* self) +{ } -static void thumbnail_source_class_init (ThumbnailSourceClass * klass) { +static void +thumbnail_source_class_init (ThumbnailSourceClass * klass) +{ #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" thumbnail_source_parent_class = g_type_class_peek_parent (klass); #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" @@ -745,15 +858,19 @@ static void thumbnail_source_class_init (ThumbnailSourceClass * klass) { ((ThumbnailSourceClass *) klass)->thumbnail_altered = thumbnail_source_real_thumbnail_altered; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" thumbnail_source_signals[THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL] = g_signal_new ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailSourceClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 749 "DataSourceTypes.c" +#line 862 "DataSourceTypes.c" } -static void thumbnail_source_instance_init (ThumbnailSource * self) { +static void +thumbnail_source_instance_init (ThumbnailSource * self) +{ } -GType thumbnail_source_get_type (void) { +GType +thumbnail_source_get_type (void) +{ static volatile gsize thumbnail_source_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailSource), 0, (GInstanceInitFunc) thumbnail_source_instance_init, NULL }; @@ -765,71 +882,89 @@ GType thumbnail_source_get_type (void) { } -PhotoSource* photo_source_construct (GType object_type, gint64 object_id) { +PhotoSource* +photo_source_construct (GType object_type, + gint64 object_id) +{ PhotoSource * self = NULL; - gint64 _tmp0_; -#line 55 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = object_id; #line 55 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - self = (PhotoSource*) media_source_construct (object_type, _tmp0_); + self = (PhotoSource*) media_source_construct (object_type, object_id); #line 54 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 778 "DataSourceTypes.c" +#line 895 "DataSourceTypes.c" } -static PhotoMetadata* photo_source_real_get_metadata (PhotoSource* self) { +static PhotoMetadata* +photo_source_real_get_metadata (PhotoSource* self) +{ #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `photo_source_get_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 787 "DataSourceTypes.c" +#line 906 "DataSourceTypes.c" } -PhotoMetadata* photo_source_get_metadata (PhotoSource* self) { +PhotoMetadata* +photo_source_get_metadata (PhotoSource* self) +{ #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_PHOTO_SOURCE (self), NULL); #line 58 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return PHOTO_SOURCE_GET_CLASS (self)->get_metadata (self); -#line 796 "DataSourceTypes.c" +#line 917 "DataSourceTypes.c" } -static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error) { +static GdkPixbuf* +photo_source_real_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error) +{ #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `photo_source_get_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 805 "DataSourceTypes.c" +#line 930 "DataSourceTypes.c" } -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error) { +GdkPixbuf* +photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error) +{ #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_PHOTO_SOURCE (self), NULL); #line 60 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return PHOTO_SOURCE_GET_CLASS (self)->get_pixbuf (self, scaling, error); -#line 814 "DataSourceTypes.c" +#line 943 "DataSourceTypes.c" } -static void photo_source_class_init (PhotoSourceClass * klass) { +static void +photo_source_class_init (PhotoSourceClass * klass) +{ #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" photo_source_parent_class = g_type_class_peek_parent (klass); #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*) (PhotoSource *)) photo_source_real_get_metadata; #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) photo_source_real_get_pixbuf; -#line 825 "DataSourceTypes.c" +#line 956 "DataSourceTypes.c" } -static void photo_source_instance_init (PhotoSource * self) { +static void +photo_source_instance_init (PhotoSource * self) +{ } -GType photo_source_get_type (void) { +GType +photo_source_get_type (void) +{ static volatile gsize photo_source_type_id__volatile = 0; if (g_once_init_enter (&photo_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoSource), 0, (GInstanceInitFunc) photo_source_instance_init, NULL }; @@ -841,28 +976,36 @@ GType photo_source_get_type (void) { } -VideoSource* video_source_construct (GType object_type) { +VideoSource* +video_source_construct (GType object_type) +{ VideoSource * self = NULL; #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" self = (VideoSource*) media_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 851 "DataSourceTypes.c" +#line 988 "DataSourceTypes.c" } -static void video_source_class_init (VideoSourceClass * klass) { +static void +video_source_class_init (VideoSourceClass * klass) +{ #line 63 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" video_source_parent_class = g_type_class_peek_parent (klass); -#line 858 "DataSourceTypes.c" +#line 997 "DataSourceTypes.c" } -static void video_source_instance_init (VideoSource * self) { +static void +video_source_instance_init (VideoSource * self) +{ } -GType video_source_get_type (void) { +GType +video_source_get_type (void) +{ static volatile gsize video_source_type_id__volatile = 0; if (g_once_init_enter (&video_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoSource), 0, (GInstanceInitFunc) video_source_instance_init, NULL }; @@ -874,151 +1017,183 @@ GType video_source_get_type (void) { } -EventSource* event_source_construct (GType object_type, gint64 object_id) { +EventSource* +event_source_construct (GType object_type, + gint64 object_id) +{ EventSource * self = NULL; - gint64 _tmp0_; -#line 72 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - _tmp0_ = object_id; #line 72 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - self = (EventSource*) thumbnail_source_construct (object_type, _tmp0_); + self = (EventSource*) thumbnail_source_construct (object_type, object_id); #line 71 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 887 "DataSourceTypes.c" +#line 1030 "DataSourceTypes.c" } -static time_t event_source_real_get_start_time (EventSource* self) { +static time_t +event_source_real_get_start_time (EventSource* self) +{ time_t _tmp0_ = 0; #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_start_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 897 "DataSourceTypes.c" +#line 1042 "DataSourceTypes.c" } -time_t event_source_get_start_time (EventSource* self) { +time_t +event_source_get_start_time (EventSource* self) +{ #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_start_time (self); -#line 906 "DataSourceTypes.c" +#line 1053 "DataSourceTypes.c" } -static time_t event_source_real_get_end_time (EventSource* self) { +static time_t +event_source_real_get_end_time (EventSource* self) +{ time_t _tmp0_ = 0; #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_end_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 916 "DataSourceTypes.c" +#line 1065 "DataSourceTypes.c" } -time_t event_source_get_end_time (EventSource* self) { +time_t +event_source_get_end_time (EventSource* self) +{ #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_end_time (self); -#line 925 "DataSourceTypes.c" +#line 1076 "DataSourceTypes.c" } -static guint64 event_source_real_get_total_filesize (EventSource* self) { +static guint64 +event_source_real_get_total_filesize (EventSource* self) +{ guint64 _tmp0_ = 0ULL; #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_total_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 935 "DataSourceTypes.c" +#line 1088 "DataSourceTypes.c" } -guint64 event_source_get_total_filesize (EventSource* self) { +guint64 +event_source_get_total_filesize (EventSource* self) +{ #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0ULL); #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_total_filesize (self); -#line 944 "DataSourceTypes.c" +#line 1099 "DataSourceTypes.c" } -static gint event_source_real_get_media_count (EventSource* self) { +static gint +event_source_real_get_media_count (EventSource* self) +{ gint _tmp0_ = 0; #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_media_count'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 954 "DataSourceTypes.c" +#line 1111 "DataSourceTypes.c" } -gint event_source_get_media_count (EventSource* self) { +gint +event_source_get_media_count (EventSource* self) +{ #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_media_count (self); -#line 963 "DataSourceTypes.c" +#line 1122 "DataSourceTypes.c" } -static GeeCollection* event_source_real_get_media (EventSource* self) { +static GeeCollection* +event_source_real_get_media (EventSource* self) +{ #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_media'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 972 "DataSourceTypes.c" +#line 1133 "DataSourceTypes.c" } -GeeCollection* event_source_get_media (EventSource* self) { +GeeCollection* +event_source_get_media (EventSource* self) +{ #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL); #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_media (self); -#line 981 "DataSourceTypes.c" +#line 1144 "DataSourceTypes.c" } -static gchar* event_source_real_get_comment (EventSource* self) { +static gchar* +event_source_real_get_comment (EventSource* self) +{ #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 990 "DataSourceTypes.c" +#line 1155 "DataSourceTypes.c" } -gchar* event_source_get_comment (EventSource* self) { +gchar* +event_source_get_comment (EventSource* self) +{ #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL); #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_comment (self); -#line 999 "DataSourceTypes.c" +#line 1166 "DataSourceTypes.c" } -static gboolean event_source_real_set_comment (EventSource* self, const gchar* comment) { +static gboolean +event_source_real_set_comment (EventSource* self, + const gchar* comment) +{ gboolean _tmp0_ = FALSE; #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return _tmp0_; -#line 1009 "DataSourceTypes.c" +#line 1179 "DataSourceTypes.c" } -gboolean event_source_set_comment (EventSource* self, const gchar* comment) { +gboolean +event_source_set_comment (EventSource* self, + const gchar* comment) +{ #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (self), FALSE); #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->set_comment (self, comment); -#line 1018 "DataSourceTypes.c" +#line 1191 "DataSourceTypes.c" } -static void event_source_class_init (EventSourceClass * klass) { +static void +event_source_class_init (EventSourceClass * klass) +{ #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" event_source_parent_class = g_type_class_peek_parent (klass); #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" @@ -1035,15 +1210,19 @@ static void event_source_class_init (EventSourceClass * klass) { ((EventSourceClass *) klass)->get_comment = (gchar* (*) (EventSource *)) event_source_real_get_comment; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((EventSourceClass *) klass)->set_comment = (gboolean (*) (EventSource *, const gchar*)) event_source_real_set_comment; -#line 1039 "DataSourceTypes.c" +#line 1214 "DataSourceTypes.c" } -static void event_source_instance_init (EventSource * self) { +static void +event_source_instance_init (EventSource * self) +{ } -GType event_source_get_type (void) { +GType +event_source_get_type (void) +{ static volatile gsize event_source_type_id__volatile = 0; if (g_once_init_enter (&event_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventSource), 0, (GInstanceInitFunc) event_source_instance_init, NULL }; @@ -1055,73 +1234,93 @@ GType event_source_get_type (void) { } -gboolean container_source_has_links (ContainerSource* self) { +gboolean +container_source_has_links (ContainerSource* self) +{ #line 95 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE (self), FALSE); #line 95 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return CONTAINER_SOURCE_GET_INTERFACE (self)->has_links (self); -#line 1064 "DataSourceTypes.c" +#line 1245 "DataSourceTypes.c" } -SourceBacklink* container_source_get_backlink (ContainerSource* self) { +SourceBacklink* +container_source_get_backlink (ContainerSource* self) +{ #line 97 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE (self), NULL); #line 97 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return CONTAINER_SOURCE_GET_INTERFACE (self)->get_backlink (self); -#line 1073 "DataSourceTypes.c" +#line 1256 "DataSourceTypes.c" } -void container_source_break_link (ContainerSource* self, DataSource* source) { +void +container_source_break_link (ContainerSource* self, + DataSource* source) +{ #line 99 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 99 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->break_link (self, source); -#line 1082 "DataSourceTypes.c" +#line 1268 "DataSourceTypes.c" } -void container_source_break_link_many (ContainerSource* self, GeeCollection* sources) { +void +container_source_break_link_many (ContainerSource* self, + GeeCollection* sources) +{ #line 101 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 101 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->break_link_many (self, sources); -#line 1091 "DataSourceTypes.c" +#line 1280 "DataSourceTypes.c" } -void container_source_establish_link (ContainerSource* self, DataSource* source) { +void +container_source_establish_link (ContainerSource* self, + DataSource* source) +{ #line 103 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 103 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link (self, source); -#line 1100 "DataSourceTypes.c" +#line 1292 "DataSourceTypes.c" } -void container_source_establish_link_many (ContainerSource* self, GeeCollection* sources) { +void +container_source_establish_link_many (ContainerSource* self, + GeeCollection* sources) +{ #line 105 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 105 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link_many (self, sources); -#line 1109 "DataSourceTypes.c" +#line 1304 "DataSourceTypes.c" } -static void container_source_base_init (ContainerSourceIface * iface) { +static void +container_source_base_init (ContainerSourceIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" static gboolean initialized = FALSE; #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" if (!initialized) { #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" initialized = TRUE; -#line 1120 "DataSourceTypes.c" +#line 1317 "DataSourceTypes.c" } } -GType container_source_get_type (void) { +GType +container_source_get_type (void) +{ static volatile gsize container_source_type_id__volatile = 0; if (g_once_init_enter (&container_source_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ContainerSourceIface), (GBaseInitFunc) container_source_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/core/DataView.c b/src/core/DataView.c index 004d364..7267434 100644 --- a/src/core/DataView.c +++ b/src/core/DataView.c @@ -1,4 +1,4 @@ -/* DataView.c generated by valac 0.36.6, the Vala compiler +/* DataView.c generated by valac 0.40.4, the Vala compiler * generated from DataView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -64,6 +65,11 @@ typedef struct _DataViewPrivate DataViewPrivate; typedef struct _DataSource DataSource; typedef struct _DataSourceClass DataSourceClass; +enum { + DATA_VIEW_0_PROPERTY, + DATA_VIEW_NUM_PROPERTIES +}; +static GParamSpec* data_view_properties[DATA_VIEW_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) @@ -83,9 +89,9 @@ enum { DATA_VIEW_VIEW_ALTERED_SIGNAL, DATA_VIEW_GEOMETRY_ALTERED_SIGNAL, DATA_VIEW_UNSUBSCRIBED_SIGNAL, - DATA_VIEW_LAST_SIGNAL + DATA_VIEW_NUM_SIGNALS }; -static guint data_view_signals[DATA_VIEW_LAST_SIGNAL] = {0}; +static guint data_view_signals[DATA_VIEW_NUM_SIGNALS] = {0}; struct _DataObject { GObject parent_instance; @@ -131,101 +137,126 @@ static gpointer data_view_parent_class = NULL; 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; 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_view_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; #define DATA_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_VIEW, DataViewPrivate)) -enum { - DATA_VIEW_DUMMY_PROPERTY -}; -void data_source_internal_unsubscribe (DataSource* self, DataView* view); +void data_source_internal_unsubscribe (DataSource* self, + DataView* view); DataView* data_view_new (DataSource* source); -DataView* data_view_construct (GType object_type, DataSource* source); +DataView* data_view_construct (GType object_type, + DataSource* source); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) -DataObject* data_object_construct (GType object_type, gint64 object_id); -void data_source_internal_subscribe (DataSource* self, DataView* view); +DataObject* data_object_construct (GType object_type, + gint64 object_id); +void data_source_internal_subscribe (DataSource* self, + DataView* view); static gchar* data_view_real_get_name (DataObject* base); gchar* data_object_get_name (DataObject* self); static gchar* data_view_real_to_string (DataObject* base); gchar* data_object_to_string (DataObject* self); DataSource* data_view_get_source (DataView* self); gboolean data_view_is_selected (DataView* self); -void data_view_internal_set_selected (DataView* self, gboolean selected); +void data_view_internal_set_selected (DataView* self, + gboolean selected); gboolean data_view_internal_toggle (DataView* self); gboolean data_view_is_visible (DataView* self); -void data_view_internal_set_visible (DataView* self, gboolean visible); +void data_view_internal_set_visible (DataView* self, + gboolean visible); void data_view_notify_view_altered (DataView* self); static void data_view_real_notify_view_altered (DataView* self); GType view_collection_get_type (void) G_GNUC_CONST; DataCollection* data_object_get_membership (DataObject* self); gboolean data_collection_are_notifications_frozen (DataCollection* self); -void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view); +void view_collection_internal_notify_view_altered (ViewCollection* self, + DataView* view); void data_view_notify_geometry_altered (DataView* self); static void data_view_real_notify_geometry_altered (DataView* self); -void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view); -void data_view_notify_unsubscribed (DataView* self, DataSource* source); -static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source); -static void data_view_real_state_changed (DataView* self, gboolean selected); -static void data_view_real_visibility_changed (DataView* self, gboolean visible); +void view_collection_internal_notify_geometry_altered (ViewCollection* self, + DataView* view); +void data_view_notify_unsubscribed (DataView* self, + DataSource* source); +static void data_view_real_notify_unsubscribed (DataView* self, + DataSource* source); +static void data_view_real_state_changed (DataView* self, + gboolean selected); +static void data_view_real_visibility_changed (DataView* self, + gboolean visible); static void data_view_real_view_altered (DataView* self); static void data_view_real_geometry_altered (DataView* self); -static void data_view_real_unsubscribed (DataView* self, DataSource* source); +static void data_view_real_unsubscribed (DataView* self, + DataSource* source); static void data_view_finalize (GObject * obj); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" return self ? g_object_ref (self) : NULL; -#line 191 "DataView.c" +#line 221 "DataView.c" } -DataView* data_view_construct (GType object_type, DataSource* source) { +DataView* +data_view_construct (GType object_type, + DataSource* source) +{ DataView * self = NULL; DataSource* _tmp0_; - DataSource* _tmp1_; - DataSource* _tmp2_; #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" self = (DataView*) data_object_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID); #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp0_ = source; -#line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (source); #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" _g_object_unref0 (self->priv->source); #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala" - self->priv->source = _tmp1_; -#line 37 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp2_ = source; + self->priv->source = _tmp0_; #line 37 "/home/jens/Source/shotwell/src/core/DataView.vala" - data_source_internal_subscribe (_tmp2_, self); + data_source_internal_subscribe (source, self); #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" return self; -#line 218 "DataView.c" +#line 245 "DataView.c" } -DataView* data_view_new (DataSource* source) { +DataView* +data_view_new (DataSource* source) +{ #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" return data_view_construct (TYPE_DATA_VIEW, source); -#line 225 "DataView.c" +#line 254 "DataView.c" } -static gchar* data_view_real_get_name (DataObject* base) { +static gchar* +data_view_real_get_name (DataObject* base) +{ DataView * self; gchar* result = NULL; DataSource* _tmp0_; @@ -251,11 +282,13 @@ static gchar* data_view_real_get_name (DataObject* base) { result = _tmp4_; #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 255 "DataView.c" +#line 286 "DataView.c" } -static gchar* data_view_real_to_string (DataObject* base) { +static gchar* +data_view_real_to_string (DataObject* base) +{ DataView * self; gchar* result = NULL; gchar* _tmp0_; @@ -289,11 +322,13 @@ static gchar* data_view_real_to_string (DataObject* base) { result = _tmp6_; #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 293 "DataView.c" +#line 326 "DataView.c" } -DataSource* data_view_get_source (DataView* self) { +DataSource* +data_view_get_source (DataView* self) +{ DataSource* result = NULL; DataSource* _tmp0_; DataSource* _tmp1_; @@ -307,11 +342,13 @@ DataSource* data_view_get_source (DataView* self) { result = _tmp1_; #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 311 "DataView.c" +#line 346 "DataView.c" } -gboolean data_view_is_selected (DataView* self) { +gboolean +data_view_is_selected (DataView* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 59 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -322,40 +359,36 @@ gboolean data_view_is_selected (DataView* self) { result = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 326 "DataView.c" +#line 363 "DataView.c" } -void data_view_internal_set_selected (DataView* self, gboolean selected) { +void +data_view_internal_set_selected (DataView* self, + gboolean selected) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 64 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 65 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp0_ = self->priv->selected; #line 65 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp1_ = selected; -#line 65 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == selected) { #line 66 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 345 "DataView.c" +#line 380 "DataView.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp2_ = selected; -#line 68 "/home/jens/Source/shotwell/src/core/DataView.vala" - self->priv->selected = _tmp2_; + self->priv->selected = selected; #line 69 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp3_ = selected; -#line 69 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp3_); -#line 355 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, selected); +#line 386 "DataView.c" } -gboolean data_view_internal_toggle (DataView* self) { +gboolean +data_view_internal_toggle (DataView* self) +{ gboolean result = FALSE; gboolean _tmp0_; gboolean _tmp1_; @@ -376,11 +409,13 @@ gboolean data_view_internal_toggle (DataView* self) { result = _tmp2_; #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 380 "DataView.c" +#line 413 "DataView.c" } -gboolean data_view_is_visible (DataView* self) { +gboolean +data_view_is_visible (DataView* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 80 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -391,40 +426,36 @@ gboolean data_view_is_visible (DataView* self) { result = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 395 "DataView.c" +#line 430 "DataView.c" } -void data_view_internal_set_visible (DataView* self, gboolean visible) { +void +data_view_internal_set_visible (DataView* self, + gboolean visible) +{ gboolean _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; - gboolean _tmp3_; #line 85 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 86 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp0_ = self->priv->visible; #line 86 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp1_ = visible; -#line 86 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == visible) { #line 87 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 414 "DataView.c" +#line 447 "DataView.c" } #line 89 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp2_ = visible; -#line 89 "/home/jens/Source/shotwell/src/core/DataView.vala" - self->priv->visible = _tmp2_; + self->priv->visible = visible; #line 90 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp3_ = visible; -#line 90 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_); -#line 424 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, visible); +#line 453 "DataView.c" } -static void data_view_real_notify_view_altered (DataView* self) { +static void +data_view_real_notify_view_altered (DataView* self) +{ gboolean _tmp0_; ViewCollection* vc = NULL; DataCollection* _tmp1_; @@ -436,7 +467,7 @@ static void data_view_real_notify_view_altered (DataView* self) { if (!_tmp0_) { #line 96 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 440 "DataView.c" +#line 471 "DataView.c" } #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); @@ -446,7 +477,7 @@ static void data_view_real_notify_view_altered (DataView* self) { if (_tmp2_ == NULL) { #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (_tmp1_); -#line 450 "DataView.c" +#line 481 "DataView.c" } #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala" vc = _tmp2_; @@ -454,46 +485,47 @@ static void data_view_real_notify_view_altered (DataView* self) { _tmp3_ = vc; #line 99 "/home/jens/Source/shotwell/src/core/DataView.vala" if (_tmp3_ != NULL) { -#line 458 "DataView.c" +#line 489 "DataView.c" ViewCollection* _tmp4_; - gboolean _tmp5_; - ViewCollection* _tmp6_; + ViewCollection* _tmp5_; #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp4_ = vc; #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp5_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection)); -#line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (!_tmp5_) { + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection))) { #line 101 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0); -#line 470 "DataView.c" +#line 498 "DataView.c" } #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp6_ = vc; + _tmp5_ = vc; #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala" - view_collection_internal_notify_view_altered (_tmp6_, self); -#line 476 "DataView.c" + view_collection_internal_notify_view_altered (_tmp5_, self); +#line 504 "DataView.c" } else { #line 106 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0); -#line 480 "DataView.c" +#line 508 "DataView.c" } #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (vc); -#line 484 "DataView.c" +#line 512 "DataView.c" } -void data_view_notify_view_altered (DataView* self) { +void +data_view_notify_view_altered (DataView* self) +{ #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala" DATA_VIEW_GET_CLASS (self)->notify_view_altered (self); -#line 493 "DataView.c" +#line 523 "DataView.c" } -static void data_view_real_notify_geometry_altered (DataView* self) { +static void +data_view_real_notify_geometry_altered (DataView* self) +{ gboolean _tmp0_; ViewCollection* vc = NULL; DataCollection* _tmp1_; @@ -505,7 +537,7 @@ static void data_view_real_notify_geometry_altered (DataView* self) { if (!_tmp0_) { #line 113 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 509 "DataView.c" +#line 541 "DataView.c" } #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); @@ -515,7 +547,7 @@ static void data_view_real_notify_geometry_altered (DataView* self) { if (_tmp2_ == NULL) { #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (_tmp1_); -#line 519 "DataView.c" +#line 551 "DataView.c" } #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala" vc = _tmp2_; @@ -523,90 +555,107 @@ static void data_view_real_notify_geometry_altered (DataView* self) { _tmp3_ = vc; #line 116 "/home/jens/Source/shotwell/src/core/DataView.vala" if (_tmp3_ != NULL) { -#line 527 "DataView.c" +#line 559 "DataView.c" ViewCollection* _tmp4_; - gboolean _tmp5_; - ViewCollection* _tmp6_; + ViewCollection* _tmp5_; #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp4_ = vc; #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp5_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection)); -#line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" - if (!_tmp5_) { + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection))) { #line 118 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0); -#line 539 "DataView.c" +#line 568 "DataView.c" } #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp6_ = vc; + _tmp5_ = vc; #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala" - view_collection_internal_notify_geometry_altered (_tmp6_, self); -#line 545 "DataView.c" + view_collection_internal_notify_geometry_altered (_tmp5_, self); +#line 574 "DataView.c" } else { #line 123 "/home/jens/Source/shotwell/src/core/DataView.vala" g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0); -#line 549 "DataView.c" +#line 578 "DataView.c" } #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (vc); -#line 553 "DataView.c" +#line 582 "DataView.c" } -void data_view_notify_geometry_altered (DataView* self) { +void +data_view_notify_geometry_altered (DataView* self) +{ #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala" DATA_VIEW_GET_CLASS (self)->notify_geometry_altered (self); -#line 562 "DataView.c" +#line 593 "DataView.c" } -static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source) { - DataSource* _tmp0_; +static void +data_view_real_notify_unsubscribed (DataView* self, + DataSource* source) +{ #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 129 "/home/jens/Source/shotwell/src/core/DataView.vala" - _tmp0_ = source; -#line 129 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, _tmp0_); -#line 574 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, source); +#line 605 "DataView.c" } -void data_view_notify_unsubscribed (DataView* self, DataSource* source) { +void +data_view_notify_unsubscribed (DataView* self, + DataSource* source) +{ #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_VIEW (self)); #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala" DATA_VIEW_GET_CLASS (self)->notify_unsubscribed (self, source); -#line 583 "DataView.c" +#line 617 "DataView.c" } -static void data_view_real_state_changed (DataView* self, gboolean selected) { +static void +data_view_real_state_changed (DataView* self, + gboolean selected) +{ } -static void data_view_real_visibility_changed (DataView* self, gboolean visible) { +static void +data_view_real_visibility_changed (DataView* self, + gboolean visible) +{ } -static void data_view_real_view_altered (DataView* self) { +static void +data_view_real_view_altered (DataView* self) +{ } -static void data_view_real_geometry_altered (DataView* self) { +static void +data_view_real_geometry_altered (DataView* self) +{ } -static void data_view_real_unsubscribed (DataView* self, DataSource* source) { +static void +data_view_real_unsubscribed (DataView* self, + DataSource* source) +{ #line 29 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 606 "DataView.c" +#line 653 "DataView.c" } -static void data_view_class_init (DataViewClass * klass) { +static void +data_view_class_init (DataViewClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" data_view_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -643,22 +692,26 @@ static void data_view_class_init (DataViewClass * klass) { data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL] = g_signal_new ("geometry-altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL] = g_signal_new ("unsubscribed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, unsubscribed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); -#line 647 "DataView.c" +#line 696 "DataView.c" } -static void data_view_instance_init (DataView * self) { +static void +data_view_instance_init (DataView * self) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" self->priv = DATA_VIEW_GET_PRIVATE (self); #line 9 "/home/jens/Source/shotwell/src/core/DataView.vala" self->priv->selected = FALSE; #line 10 "/home/jens/Source/shotwell/src/core/DataView.vala" self->priv->visible = TRUE; -#line 658 "DataView.c" +#line 709 "DataView.c" } -static void data_view_finalize (GObject * obj) { +static void +data_view_finalize (GObject * obj) +{ DataView * self; DataSource* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -671,11 +724,13 @@ static void data_view_finalize (GObject * obj) { _g_object_unref0 (self->priv->source); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" G_OBJECT_CLASS (data_view_parent_class)->finalize (obj); -#line 675 "DataView.c" +#line 728 "DataView.c" } -GType data_view_get_type (void) { +GType +data_view_get_type (void) +{ static volatile gsize data_view_type_id__volatile = 0; if (g_once_init_enter (&data_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DataViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataView), 0, (GInstanceInitFunc) data_view_instance_init, NULL }; diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c index c1ae9e3..b70a8ff 100644 --- a/src/core/DataViewTypes.c +++ b/src/core/DataViewTypes.c @@ -1,4 +1,4 @@ -/* DataViewTypes.c generated by valac 0.36.6, the Vala compiler +/* DataViewTypes.c generated by valac 0.40.4, the Vala compiler * generated from DataViewTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -75,6 +76,11 @@ typedef struct _DataSourceClass DataSourceClass; typedef struct _ThumbnailView ThumbnailView; typedef struct _ThumbnailViewClass ThumbnailViewClass; typedef struct _ThumbnailViewPrivate ThumbnailViewPrivate; +enum { + THUMBNAIL_VIEW_0_PROPERTY, + THUMBNAIL_VIEW_NUM_PROPERTIES +}; +static GParamSpec* thumbnail_view_properties[THUMBNAIL_VIEW_NUM_PROPERTIES]; #define TYPE_THUMBNAIL_SOURCE (thumbnail_source_get_type ()) #define THUMBNAIL_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_THUMBNAIL_SOURCE, ThumbnailSource)) @@ -87,9 +93,9 @@ typedef struct _ThumbnailSource ThumbnailSource; typedef struct _ThumbnailSourceClass ThumbnailSourceClass; enum { THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL, - THUMBNAIL_VIEW_LAST_SIGNAL + THUMBNAIL_VIEW_NUM_SIGNALS }; -static guint thumbnail_view_signals[THUMBNAIL_VIEW_LAST_SIGNAL] = {0}; +static guint thumbnail_view_signals[THUMBNAIL_VIEW_NUM_SIGNALS] = {0}; #define TYPE_PHOTO_VIEW (photo_view_get_type ()) #define PHOTO_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_VIEW, PhotoView)) @@ -101,6 +107,11 @@ static guint thumbnail_view_signals[THUMBNAIL_VIEW_LAST_SIGNAL] = {0}; typedef struct _PhotoView PhotoView; typedef struct _PhotoViewClass PhotoViewClass; typedef struct _PhotoViewPrivate PhotoViewPrivate; +enum { + PHOTO_VIEW_0_PROPERTY, + PHOTO_VIEW_NUM_PROPERTIES +}; +static GParamSpec* photo_view_properties[PHOTO_VIEW_NUM_PROPERTIES]; #define TYPE_MEDIA_SOURCE (media_source_get_type ()) #define MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE, MediaSource)) @@ -132,6 +143,11 @@ typedef struct _PhotoSourceClass PhotoSourceClass; typedef struct _VideoView VideoView; typedef struct _VideoViewClass VideoViewClass; typedef struct _VideoViewPrivate VideoViewPrivate; +enum { + VIDEO_VIEW_0_PROPERTY, + VIDEO_VIEW_NUM_PROPERTIES +}; +static GParamSpec* video_view_properties[VIDEO_VIEW_NUM_PROPERTIES]; #define TYPE_VIDEO_SOURCE (video_source_get_type ()) #define VIDEO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE, VideoSource)) @@ -153,6 +169,11 @@ typedef struct _VideoSourceClass VideoSourceClass; typedef struct _EventView EventView; typedef struct _EventViewClass EventViewClass; typedef struct _EventViewPrivate EventViewPrivate; +enum { + EVENT_VIEW_0_PROPERTY, + EVENT_VIEW_NUM_PROPERTIES +}; +static GParamSpec* event_view_properties[EVENT_VIEW_NUM_PROPERTIES]; #define TYPE_EVENT_SOURCE (event_source_get_type ()) #define EVENT_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_SOURCE, EventSource)) @@ -243,103 +264,118 @@ static gpointer event_view_parent_class = NULL; 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; 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_view_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; -enum { - THUMBNAIL_VIEW_DUMMY_PROPERTY -}; GType thumbnail_source_get_type (void) G_GNUC_CONST; ThumbnailView* thumbnail_view_new (ThumbnailSource* source); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source); +ThumbnailView* thumbnail_view_construct (GType object_type, + ThumbnailSource* source); DataView* data_view_new (DataSource* source); -DataView* data_view_construct (GType object_type, DataSource* source); +DataView* data_view_construct (GType object_type, + DataSource* source); void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self); static void thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self); static void thumbnail_view_real_thumbnail_altered (ThumbnailView* self); GType photo_view_get_type (void) G_GNUC_CONST; -enum { - PHOTO_VIEW_DUMMY_PROPERTY -}; GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; PhotoView* photo_view_new (PhotoSource* source); -PhotoView* photo_view_construct (GType object_type, PhotoSource* source); +PhotoView* photo_view_construct (GType object_type, + PhotoSource* source); PhotoSource* photo_view_get_photo_source (PhotoView* self); DataSource* data_view_get_source (DataView* self); GType video_view_get_type (void) G_GNUC_CONST; -enum { - VIDEO_VIEW_DUMMY_PROPERTY -}; GType video_source_get_type (void) G_GNUC_CONST; VideoView* video_view_new (VideoSource* source); -VideoView* video_view_construct (GType object_type, VideoSource* source); +VideoView* video_view_construct (GType object_type, + VideoSource* source); VideoSource* video_view_get_video_source (VideoView* self); GType event_view_get_type (void) G_GNUC_CONST; -enum { - EVENT_VIEW_DUMMY_PROPERTY -}; GType event_source_get_type (void) G_GNUC_CONST; EventView* event_view_new (EventSource* source); -EventView* event_view_construct (GType object_type, EventSource* source); +EventView* event_view_construct (GType object_type, + EventSource* source); EventSource* event_view_get_event_source (EventView* self); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source) { +ThumbnailView* +thumbnail_view_construct (GType object_type, + ThumbnailSource* source) +{ ThumbnailView * self = NULL; - ThumbnailSource* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); #line 12 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 12 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (ThumbnailView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + self = (ThumbnailView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 312 "DataViewTypes.c" +#line 338 "DataViewTypes.c" } -ThumbnailView* thumbnail_view_new (ThumbnailSource* source) { +ThumbnailView* +thumbnail_view_new (ThumbnailSource* source) +{ #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return thumbnail_view_construct (TYPE_THUMBNAIL_VIEW, source); -#line 319 "DataViewTypes.c" +#line 347 "DataViewTypes.c" } -static void thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self) { +static void +thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self) +{ #line 17 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_signal_emit (self, thumbnail_view_signals[THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL], 0); -#line 326 "DataViewTypes.c" +#line 356 "DataViewTypes.c" } -void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self) { +void +thumbnail_view_notify_thumbnail_altered (ThumbnailView* self) +{ #line 15 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_if_fail (IS_THUMBNAIL_VIEW (self)); #line 15 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" THUMBNAIL_VIEW_GET_CLASS (self)->notify_thumbnail_altered (self); -#line 335 "DataViewTypes.c" +#line 367 "DataViewTypes.c" } -static void thumbnail_view_real_thumbnail_altered (ThumbnailView* self) { +static void +thumbnail_view_real_thumbnail_altered (ThumbnailView* self) +{ } -static void thumbnail_view_class_init (ThumbnailViewClass * klass) { +static void +thumbnail_view_class_init (ThumbnailViewClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" thumbnail_view_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -348,15 +384,19 @@ static void thumbnail_view_class_init (ThumbnailViewClass * klass) { ((ThumbnailViewClass *) klass)->thumbnail_altered = thumbnail_view_real_thumbnail_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" thumbnail_view_signals[THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL] = g_signal_new ("thumbnail-altered", TYPE_THUMBNAIL_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ThumbnailViewClass, thumbnail_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 352 "DataViewTypes.c" +#line 388 "DataViewTypes.c" } -static void thumbnail_view_instance_init (ThumbnailView * self) { +static void +thumbnail_view_instance_init (ThumbnailView * self) +{ } -GType thumbnail_view_get_type (void) { +GType +thumbnail_view_get_type (void) +{ static volatile gsize thumbnail_view_type_id__volatile = 0; if (g_once_init_enter (&thumbnail_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ThumbnailViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailView), 0, (GInstanceInitFunc) thumbnail_view_instance_init, NULL }; @@ -368,29 +408,33 @@ GType thumbnail_view_get_type (void) { } -PhotoView* photo_view_construct (GType object_type, PhotoSource* source) { +PhotoView* +photo_view_construct (GType object_type, + PhotoSource* source) +{ PhotoView * self = NULL; - PhotoSource* _tmp0_; #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_PHOTO_SOURCE (source), NULL); #line 23 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 23 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (PhotoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + self = (PhotoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 383 "DataViewTypes.c" +#line 423 "DataViewTypes.c" } -PhotoView* photo_view_new (PhotoSource* source) { +PhotoView* +photo_view_new (PhotoSource* source) +{ #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return photo_view_construct (TYPE_PHOTO_VIEW, source); -#line 390 "DataViewTypes.c" +#line 432 "DataViewTypes.c" } -PhotoSource* photo_view_get_photo_source (PhotoView* self) { +PhotoSource* +photo_view_get_photo_source (PhotoView* self) +{ PhotoSource* result = NULL; DataSource* _tmp0_; #line 26 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -401,22 +445,28 @@ PhotoSource* photo_view_get_photo_source (PhotoView* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource); #line 27 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return result; -#line 405 "DataViewTypes.c" +#line 449 "DataViewTypes.c" } -static void photo_view_class_init (PhotoViewClass * klass) { +static void +photo_view_class_init (PhotoViewClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" photo_view_parent_class = g_type_class_peek_parent (klass); -#line 412 "DataViewTypes.c" +#line 458 "DataViewTypes.c" } -static void photo_view_instance_init (PhotoView * self) { +static void +photo_view_instance_init (PhotoView * self) +{ } -GType photo_view_get_type (void) { +GType +photo_view_get_type (void) +{ static volatile gsize photo_view_type_id__volatile = 0; if (g_once_init_enter (&photo_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoView), 0, (GInstanceInitFunc) photo_view_instance_init, NULL }; @@ -428,29 +478,33 @@ GType photo_view_get_type (void) { } -VideoView* video_view_construct (GType object_type, VideoSource* source) { +VideoView* +video_view_construct (GType object_type, + VideoSource* source) +{ VideoView * self = NULL; - VideoSource* _tmp0_; #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_VIDEO_SOURCE (source), NULL); #line 33 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 33 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (VideoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + self = (VideoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 443 "DataViewTypes.c" +#line 493 "DataViewTypes.c" } -VideoView* video_view_new (VideoSource* source) { +VideoView* +video_view_new (VideoSource* source) +{ #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return video_view_construct (TYPE_VIDEO_VIEW, source); -#line 450 "DataViewTypes.c" +#line 502 "DataViewTypes.c" } -VideoSource* video_view_get_video_source (VideoView* self) { +VideoSource* +video_view_get_video_source (VideoView* self) +{ VideoSource* result = NULL; DataSource* _tmp0_; #line 36 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -461,22 +515,28 @@ VideoSource* video_view_get_video_source (VideoView* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO_SOURCE, VideoSource); #line 37 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return result; -#line 465 "DataViewTypes.c" +#line 519 "DataViewTypes.c" } -static void video_view_class_init (VideoViewClass * klass) { +static void +video_view_class_init (VideoViewClass * klass) +{ #line 31 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" video_view_parent_class = g_type_class_peek_parent (klass); -#line 472 "DataViewTypes.c" +#line 528 "DataViewTypes.c" } -static void video_view_instance_init (VideoView * self) { +static void +video_view_instance_init (VideoView * self) +{ } -GType video_view_get_type (void) { +GType +video_view_get_type (void) +{ static volatile gsize video_view_type_id__volatile = 0; if (g_once_init_enter (&video_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (VideoViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoView), 0, (GInstanceInitFunc) video_view_instance_init, NULL }; @@ -488,29 +548,33 @@ GType video_view_get_type (void) { } -EventView* event_view_construct (GType object_type, EventSource* source) { +EventView* +event_view_construct (GType object_type, + EventSource* source) +{ EventView * self = NULL; - EventSource* _tmp0_; #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_EVENT_SOURCE (source), NULL); #line 43 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - _tmp0_ = source; -#line 43 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - self = (EventView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + self = (EventView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 503 "DataViewTypes.c" +#line 563 "DataViewTypes.c" } -EventView* event_view_new (EventSource* source) { +EventView* +event_view_new (EventSource* source) +{ #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return event_view_construct (TYPE_EVENT_VIEW, source); -#line 510 "DataViewTypes.c" +#line 572 "DataViewTypes.c" } -EventSource* event_view_get_event_source (EventView* self) { +EventSource* +event_view_get_event_source (EventView* self) +{ EventSource* result = NULL; DataSource* _tmp0_; #line 46 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -521,22 +585,28 @@ EventSource* event_view_get_event_source (EventView* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource); #line 47 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return result; -#line 525 "DataViewTypes.c" +#line 589 "DataViewTypes.c" } -static void event_view_class_init (EventViewClass * klass) { +static void +event_view_class_init (EventViewClass * klass) +{ #line 41 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" event_view_parent_class = g_type_class_peek_parent (klass); -#line 532 "DataViewTypes.c" +#line 598 "DataViewTypes.c" } -static void event_view_instance_init (EventView * self) { +static void +event_view_instance_init (EventView * self) +{ } -GType event_view_get_type (void) { +GType +event_view_get_type (void) +{ static volatile gsize event_view_type_id__volatile = 0; if (g_once_init_enter (&event_view_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventView), 0, (GInstanceInitFunc) event_view_instance_init, NULL }; diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c index 192d771..b61808a 100644 --- a/src/core/DatabaseSourceCollection.c +++ b/src/core/DatabaseSourceCollection.c @@ -1,4 +1,4 @@ -/* DatabaseSourceCollection.c generated by valac 0.36.6, the Vala compiler +/* DatabaseSourceCollection.c generated by valac 0.40.4, the Vala compiler * generated from DatabaseSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -257,86 +258,145 @@ GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; 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; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; #define DATABASE_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollectionPrivate)) -enum { - DATABASE_SOURCE_COLLECTION_DUMMY_PROPERTY -}; guint int64_hash (gint64* n); -static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean int64_equal (gint64* a, gint64* b); -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _int64_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean int64_equal (gint64* a, + gint64* b); +static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); static gint64* _int64_dup (gint64* self); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -SourceCollection* source_collection_construct (GType object_type, const gchar* name); -static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +SourceCollection* source_collection_construct (GType object_type, + const gchar* name); +static void database_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void database_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); static void database_source_collection_finalize (DataCollection * obj); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType database_source_holding_tank_get_type (void) G_GNUC_CONST; #define DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTankPrivate)) -enum { - DATABASE_SOURCE_HOLDING_TANK_DUMMY_PROPERTY -}; -DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target); -SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id); -static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed); -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); +DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target); +SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +SourceHoldingTank* source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, + gint64 id); +static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed); +void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); static void database_source_holding_tank_finalize (SourceHoldingTank * obj); -static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_int64_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = int64_hash ((gint64*) v); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 327 "DatabaseSourceCollection.c" +#line 381 "DatabaseSourceCollection.c" } -static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_int64_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = int64_equal ((gint64*) a, (gint64*) b); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 336 "DatabaseSourceCollection.c" +#line 394 "DatabaseSourceCollection.c" } -static gint64* _int64_dup (gint64* self) { +static gint64* +_int64_dup (gint64* self) +{ gint64* dup; #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" dup = g_new0 (gint64, 1); @@ -344,260 +404,239 @@ static gint64* _int64_dup (gint64* self) { memcpy (dup, self, sizeof (gint64)); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return dup; -#line 348 "DatabaseSourceCollection.c" +#line 408 "DatabaseSourceCollection.c" } -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) { +DatabaseSourceCollection* +database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target) +{ DatabaseSourceCollection* self = NULL; - const gchar* _tmp0_; - GetSourceDatabaseKey _tmp1_; - void* _tmp1__target; #line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = name; -#line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self = (DatabaseSourceCollection*) source_collection_construct (object_type, _tmp0_); + self = (DatabaseSourceCollection*) source_collection_construct (object_type, name); #line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = source_key_func; + self->priv->source_key_func = source_key_func; #line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1__target = source_key_func_target; -#line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->source_key_func = _tmp1_; -#line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->source_key_func_target = _tmp1__target; + self->priv->source_key_func_target = source_key_func_target; #line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return self; -#line 373 "DatabaseSourceCollection.c" +#line 429 "DatabaseSourceCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 380 "DatabaseSourceCollection.c" +#line 438 "DatabaseSourceCollection.c" } -static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { +static void +database_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added) +{ DatabaseSourceCollection * self; - GeeIterable* _tmp17_; #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection); #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 391 "DatabaseSourceCollection.c" +#line 451 "DatabaseSourceCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = added; + GeeIterator* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (added); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 404 "DatabaseSourceCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 461 "DatabaseSourceCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataSource* source = NULL; - DataObject* _tmp6_; - DataSource* _tmp7_; + DataObject* _tmp4_; + DataSource* _tmp5_; gint64 key = 0LL; - GetSourceDatabaseKey _tmp8_; - void* _tmp8__target; - DataSource* _tmp9_; - gint64 _tmp10_; - GeeHashMap* _tmp11_; - gint64 _tmp12_; - gboolean _tmp13_; - GeeHashMap* _tmp14_; - gint64 _tmp15_; - DataSource* _tmp16_; -#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = _object_it; + GetSourceDatabaseKey _tmp6_; + void* _tmp6__target; + DataSource* _tmp7_; + GeeHashMap* _tmp8_; + gint64 _tmp9_; + GeeHashMap* _tmp10_; + gint64 _tmp11_; + DataSource* _tmp12_; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 432 "DatabaseSourceCollection.c" +#line 484 "DatabaseSourceCollection.c" } #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - source = _tmp7_; + source = _tmp5_; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8_ = self->priv->source_key_func; -#line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8__target = self->priv->source_key_func_target; + _tmp6_ = self->priv->source_key_func; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp9_ = source; + _tmp6__target = self->priv->source_key_func_target; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp10_ = _tmp8_ (_tmp9_, _tmp8__target); + _tmp7_ = source; #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - key = _tmp10_; -#line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp11_ = self->priv->map; + key = _tmp6_ (_tmp7_, _tmp6__target); #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp12_ = key; + _tmp8_ = self->priv->map; #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp12_); + _tmp9_ = key; #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _vala_assert (!_tmp13_, "!map.has_key(key)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp9_), "!map.has_key(key)"); #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp14_ = self->priv->map; + _tmp10_ = self->priv->map; #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp15_ = key; + _tmp11_ = key; #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp16_ = source; + _tmp12_ = source; #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp15_, _tmp16_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp11_, _tmp12_); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (source); #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (object); -#line 476 "DatabaseSourceCollection.c" +#line 524 "DatabaseSourceCollection.c" } #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_object_it); -#line 480 "DatabaseSourceCollection.c" +#line 528 "DatabaseSourceCollection.c" } #line 36 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp17_ = added; -#line 36 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp17_); -#line 486 "DatabaseSourceCollection.c" + DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), added); +#line 532 "DatabaseSourceCollection.c" } -static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { +static void +database_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed) +{ DatabaseSourceCollection * self; - GeeIterable* _tmp13_; #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection); #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 497 "DatabaseSourceCollection.c" +#line 545 "DatabaseSourceCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = removed; + _tmp0_ = gee_iterable_iterator (removed); #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 510 "DatabaseSourceCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 555 "DatabaseSourceCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; gint64 key = 0LL; - GetSourceDatabaseKey _tmp6_; - void* _tmp6__target; - DataObject* _tmp7_; - gint64 _tmp8_; + GetSourceDatabaseKey _tmp4_; + void* _tmp4__target; + DataObject* _tmp5_; gboolean is_removed = FALSE; - GeeHashMap* _tmp9_; - gint64 _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; + GeeHashMap* _tmp6_; + gint64 _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = _object_it; + _tmp1_ = _object_it; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 534 "DatabaseSourceCollection.c" +#line 575 "DatabaseSourceCollection.c" } #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6_ = self->priv->source_key_func; + _tmp4_ = self->priv->source_key_func; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6__target = self->priv->source_key_func_target; + _tmp4__target = self->priv->source_key_func_target; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8_ = _tmp6_ (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), _tmp6__target); -#line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - key = _tmp8_; + key = _tmp4_ (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), _tmp4__target); #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp9_ = self->priv->map; + _tmp6_ = self->priv->map; #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp10_ = key; + _tmp7_ = key; #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp11_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp10_, NULL); + _tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp7_, NULL); #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - is_removed = _tmp11_; + is_removed = _tmp8_; #line 44 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp12_ = is_removed; + _tmp9_ = is_removed; #line 44 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _vala_assert (_tmp12_, "is_removed"); + _vala_assert (_tmp9_, "is_removed"); #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (object); -#line 566 "DatabaseSourceCollection.c" +#line 605 "DatabaseSourceCollection.c" } #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_object_it); -#line 570 "DatabaseSourceCollection.c" +#line 609 "DatabaseSourceCollection.c" } #line 47 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp13_ = removed; -#line 47 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp13_); -#line 576 "DatabaseSourceCollection.c" + DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), removed); +#line 613 "DatabaseSourceCollection.c" } -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key) { +DataSource* +database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key) +{ DataSource* result = NULL; GeeHashMap* _tmp0_; - gint64 _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 50 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (IS_DATABASE_SOURCE_COLLECTION (self), NULL); #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp0_ = self->priv->map; #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = key; -#line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.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), &key); #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - result = (DataSource*) _tmp2_; + result = (DataSource*) _tmp1_; #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 597 "DatabaseSourceCollection.c" +#line 634 "DatabaseSourceCollection.c" } -static void database_source_collection_class_init (DatabaseSourceCollectionClass * klass) { +static void +database_source_collection_class_init (DatabaseSourceCollectionClass * klass) +{ #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" database_source_collection_parent_class = g_type_class_peek_parent (klass); #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -608,11 +647,13 @@ static void database_source_collection_class_init (DatabaseSourceCollectionClass ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_added; #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_removed; -#line 612 "DatabaseSourceCollection.c" +#line 651 "DatabaseSourceCollection.c" } -static void database_source_collection_instance_init (DatabaseSourceCollection * self) { +static void +database_source_collection_instance_init (DatabaseSourceCollection * self) +{ GeeHashMap* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv = DATABASE_SOURCE_COLLECTION_GET_PRIVATE (self); @@ -620,11 +661,13 @@ static void database_source_collection_instance_init (DatabaseSourceCollection * _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv->map = _tmp0_; -#line 624 "DatabaseSourceCollection.c" +#line 665 "DatabaseSourceCollection.c" } -static void database_source_collection_finalize (DataCollection * obj) { +static void +database_source_collection_finalize (DataCollection * obj) +{ DatabaseSourceCollection * self; #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection); @@ -632,11 +675,13 @@ static void database_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->map); #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" DATA_COLLECTION_CLASS (database_source_collection_parent_class)->finalize (obj); -#line 636 "DatabaseSourceCollection.c" +#line 679 "DatabaseSourceCollection.c" } -GType database_source_collection_get_type (void) { +GType +database_source_collection_get_type (void) +{ static volatile gsize database_source_collection_type_id__volatile = 0; if (g_once_init_enter (&database_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DatabaseSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) database_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DatabaseSourceCollection), 0, (GInstanceInitFunc) database_source_collection_instance_init, NULL }; @@ -648,71 +693,69 @@ GType database_source_collection_get_type (void) { } -DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +DatabaseSourceHoldingTank* +database_source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ DatabaseSourceHoldingTank* self = NULL; - SourceCollection* _tmp0_; - SourceHoldingTankCheckToKeep _tmp1_; - void* _tmp1__target; - GetSourceDatabaseKey _tmp2_; - void* _tmp2__target; #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = sources; -#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = check_to_keep; -#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1__target = check_to_keep_target; -#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self = (DatabaseSourceHoldingTank*) source_holding_tank_construct (object_type, _tmp0_, _tmp1_, _tmp1__target); -#line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = get_key; -#line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2__target = get_key_target; + self = (DatabaseSourceHoldingTank*) source_holding_tank_construct (object_type, sources, check_to_keep, check_to_keep_target); #line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->get_key = _tmp2_; + self->priv->get_key = get_key; #line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - self->priv->get_key_target = _tmp2__target; + self->priv->get_key_target = get_key_target; #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return self; -#line 679 "DatabaseSourceCollection.c" +#line 716 "DatabaseSourceCollection.c" } -DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { +DatabaseSourceHoldingTank* +database_source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target, + GetSourceDatabaseKey get_key, + void* get_key_target) +{ #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return database_source_holding_tank_construct (TYPE_DATABASE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 686 "DatabaseSourceCollection.c" +#line 729 "DatabaseSourceCollection.c" } -DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id) { +DataSource* +database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, + gint64 id) +{ DataSource* result = NULL; GeeHashMap* _tmp0_; - gint64 _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 67 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_val_if_fail (IS_DATABASE_SOURCE_HOLDING_TANK (self), NULL); #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp0_ = self->priv->map; #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = id; -#line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.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), &id); #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - result = (DataSource*) _tmp2_; + result = (DataSource*) _tmp1_; #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" return result; -#line 707 "DatabaseSourceCollection.c" +#line 750 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) { +static void +database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, + GeeCollection* added, + GeeCollection* removed) +{ DatabaseSourceHoldingTank * self; - GeeCollection* _tmp0_; - GeeCollection* _tmp12_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank); #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -720,149 +763,131 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 73 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp0_ = added; -#line 73 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (_tmp0_ != NULL) { -#line 727 "DatabaseSourceCollection.c" + if (added != NULL) { +#line 768 "DatabaseSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp0_; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp1_ = added; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 740 "DatabaseSourceCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 778 "DatabaseSourceCollection.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - GeeHashMap* _tmp7_; - GetSourceDatabaseKey _tmp8_; - void* _tmp8__target; - DataSource* _tmp9_; - gint64 _tmp10_; - DataSource* _tmp11_; -#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp3_ = _source_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GeeHashMap* _tmp4_; + GetSourceDatabaseKey _tmp5_; + void* _tmp5__target; + DataSource* _tmp6_; + gint64 _tmp7_; + DataSource* _tmp8_; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _source_it; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 760 "DatabaseSourceCollection.c" +#line 795 "DatabaseSourceCollection.c" } #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp3_; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp7_ = self->priv->map; + _tmp4_ = self->priv->map; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8_ = self->priv->get_key; + _tmp5_ = self->priv->get_key; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp8__target = self->priv->get_key_target; + _tmp5__target = self->priv->get_key_target; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp9_ = source; + _tmp6_ = source; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp10_ = _tmp8_ (_tmp9_, _tmp8__target); + _tmp7_ = _tmp5_ (_tmp6_, _tmp5__target); #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp11_ = source; + _tmp8_ = source; #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp10_, _tmp11_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp7_, _tmp8_); #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (source); -#line 784 "DatabaseSourceCollection.c" +#line 819 "DatabaseSourceCollection.c" } #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_source_it); -#line 788 "DatabaseSourceCollection.c" +#line 823 "DatabaseSourceCollection.c" } } #line 78 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp12_ = removed; -#line 78 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (_tmp12_ != NULL) { -#line 795 "DatabaseSourceCollection.c" + if (removed != NULL) { +#line 828 "DatabaseSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; -#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp13_ = removed; + GeeIterator* _tmp9_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _source_it = _tmp14_; + _source_it = _tmp9_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { -#line 808 "DatabaseSourceCollection.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 838 "DatabaseSourceCollection.c" + GeeIterator* _tmp10_; DataSource* source = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - GeeHashMap* _tmp19_; - GetSourceDatabaseKey _tmp20_; - void* _tmp20__target; - DataSource* _tmp21_; - gint64 _tmp22_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + GeeHashMap* _tmp13_; + GetSourceDatabaseKey _tmp14_; + void* _tmp14__target; + DataSource* _tmp15_; + gint64 _tmp16_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp15_ = _source_it; + _tmp10_ = _source_it; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp10_)) { #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" break; -#line 827 "DatabaseSourceCollection.c" +#line 854 "DatabaseSourceCollection.c" } #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp17_ = _source_it; + _tmp11_ = _source_it; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - source = (DataSource*) _tmp18_; + source = (DataSource*) _tmp12_; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp19_ = self->priv->map; + _tmp13_ = self->priv->map; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp20_ = self->priv->get_key; + _tmp14_ = self->priv->get_key; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp20__target = self->priv->get_key_target; + _tmp14__target = self->priv->get_key_target; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp21_ = source; + _tmp15_ = source; #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp22_ = _tmp20_ (_tmp21_, _tmp20__target); + _tmp16_ = _tmp14_ (_tmp15_, _tmp14__target); #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp22_, NULL); + gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp16_, NULL); #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (source); -#line 849 "DatabaseSourceCollection.c" +#line 876 "DatabaseSourceCollection.c" } #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _g_object_unref0 (_source_it); -#line 853 "DatabaseSourceCollection.c" +#line 880 "DatabaseSourceCollection.c" } } #line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp23_ = added; -#line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - _tmp24_ = removed; -#line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp23_, _tmp24_); -#line 862 "DatabaseSourceCollection.c" + SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), added, removed); +#line 885 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankClass * klass) { +static void +database_source_holding_tank_class_init (DatabaseSourceHoldingTankClass * klass) +{ #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" database_source_holding_tank_parent_class = g_type_class_peek_parent (klass); #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -871,11 +896,13 @@ static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankCl g_type_class_add_private (klass, sizeof (DatabaseSourceHoldingTankPrivate)); #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered; -#line 875 "DatabaseSourceCollection.c" +#line 900 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) { +static void +database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) +{ GeeHashMap* _tmp0_; #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv = DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE (self); @@ -883,11 +910,13 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv->map = _tmp0_; -#line 887 "DatabaseSourceCollection.c" +#line 914 "DatabaseSourceCollection.c" } -static void database_source_holding_tank_finalize (SourceHoldingTank * obj) { +static void +database_source_holding_tank_finalize (SourceHoldingTank * obj) +{ DatabaseSourceHoldingTank * self; #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank); @@ -895,11 +924,13 @@ static void database_source_holding_tank_finalize (SourceHoldingTank * obj) { _g_object_unref0 (self->priv->map); #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->finalize (obj); -#line 899 "DatabaseSourceCollection.c" +#line 928 "DatabaseSourceCollection.c" } -GType database_source_holding_tank_get_type (void) { +GType +database_source_holding_tank_get_type (void) +{ static volatile gsize database_source_holding_tank_type_id__volatile = 0; if (g_once_init_enter (&database_source_holding_tank_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DatabaseSourceHoldingTankClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) database_source_holding_tank_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DatabaseSourceHoldingTank), 0, (GInstanceInitFunc) database_source_holding_tank_instance_init, NULL }; diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 6742476..9de9400 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.36.6, the Vala compiler +/* SourceCollection.c generated by valac 0.40.4, the Vala compiler * generated from SourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -116,6 +117,11 @@ typedef struct _SourceCollectionDestroyCounter SourceCollectionDestroyCounter; typedef struct _SourceCollectionDestroyCounterClass SourceCollectionDestroyCounterClass; typedef struct _SourceCollectionDestroyCounterPrivate SourceCollectionDestroyCounterPrivate; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +enum { + SOURCE_COLLECTION_DESTROY_COUNTER_0_PROPERTY, + SOURCE_COLLECTION_DESTROY_COUNTER_NUM_PROPERTIES +}; +static GParamSpec* source_collection_destroy_counter_properties[SOURCE_COLLECTION_DESTROY_COUNTER_NUM_PROPERTIES]; enum { SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL, SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL, @@ -123,9 +129,9 @@ enum { SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL, SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL, SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL, - SOURCE_COLLECTION_LAST_SIGNAL + SOURCE_COLLECTION_NUM_SIGNALS }; -static guint source_collection_signals[SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint source_collection_signals[SOURCE_COLLECTION_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -236,17 +242,29 @@ static gpointer source_collection_destroy_counter_parent_class = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -254,312 +272,433 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; #define SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_COLLECTION, SourceCollectionPrivate)) -enum { - SOURCE_COLLECTION_DUMMY_PROPERTY -}; -SourceCollection* source_collection_construct (GType object_type, const gchar* name); +SourceCollection* source_collection_construct (GType object_type, + const gchar* name); DataCollection* data_collection_new (const gchar* name); -DataCollection* data_collection_construct (GType object_type, const gchar* name); -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source); -static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source); -void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -void source_collection_notify_items_relinked (SourceCollection* self, GeeCollection* relinked); -static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked); -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source); -void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object); +DataCollection* data_collection_construct (GType object_type, + const gchar* name); +gboolean source_collection_holds_type_of_source (SourceCollection* self, + DataSource* source); +static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, + DataSource* source); +void source_collection_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking); +static void source_collection_real_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking); +void source_collection_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked); +static void source_collection_real_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked); +void source_collection_notify_item_destroyed (SourceCollection* self, + DataSource* source); +static void source_collection_real_notify_item_destroyed (SourceCollection* self, + DataSource* source); +void source_collection_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed); +static void source_collection_real_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed); +void source_collection_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked); +static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked); +void source_collection_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +static void source_collection_real_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +static gboolean source_collection_real_valid_type (DataCollection* base, + DataObject* object); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); +gint source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); static GType source_collection_destroy_counter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; Marker* data_collection_start_marking (DataCollection* self); static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker); -static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker); -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user); -static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, GObject* user, gpointer self); -static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_destroy_source_marked_action (DataObject* object, GObject* user, gpointer self); -void data_collection_remove_marked (DataCollection* self, Marker* m); -gboolean data_source_internal_delete_backing (DataSource* self, GError** error); +static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, + Marker* remove_marker); +void data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user); +static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, + DataObject* object, + GObject* user); +static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, + GObject* user, + gpointer self); +static gboolean source_collection_destroy_source (SourceCollection* self, + DataObject* object, + GObject* user); +static gboolean _source_collection_destroy_source_marked_action (DataObject* object, + GObject* user, + gpointer self); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +gboolean data_source_internal_delete_backing (DataSource* self, + GError** error); void data_source_internal_mark_for_destroy (DataSource* self); void data_source_destroy (DataSource* self); -void marker_mark (Marker* self, DataObject* object); -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink); +void marker_mark (Marker* self, + DataObject* object); +void source_collection_internal_backlink_set (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); guint source_backlink_hash_func (SourceBacklink* backlink); -static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink); -static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); -static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink); -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target); -static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user); -static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, GObject* user, gpointer self); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); -void data_source_notify_unlinking (DataSource* self, SourceCollection* collection); -void source_collection_relink (SourceCollection* self, DataSource* source); -void data_source_notify_relinking (DataSource* self, SourceCollection* collection); -gboolean data_collection_add (DataCollection* self, DataObject* object); +static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean source_backlink_equal_func (SourceBacklink* alink, + SourceBacklink* blink); +static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); +void source_collection_internal_backlink_removed (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +static gboolean source_collection_real_has_backlink (SourceCollection* self, + SourceBacklink* backlink); +GeeCollection* source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target); +static gboolean source_collection_prepare_for_unlink (SourceCollection* self, + DataObject* object, + GObject* user); +static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, + GObject* user, + gpointer self); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); +void data_source_notify_unlinking (DataSource* self, + SourceCollection* collection); +void source_collection_relink (SourceCollection* self, + DataSource* source); +void data_source_notify_relinking (DataSource* self, + SourceCollection* collection); +gboolean data_collection_add (DataCollection* self, + DataObject* object); GeeCollection* data_collection_get_singleton (DataObject* object); void data_source_notify_relinked (DataSource* self); -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink); -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink); -static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking); -static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked); -static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed); -static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source); -static void source_collection_real_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources); -static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - SOURCE_COLLECTION_DESTROY_COUNTER_DUMMY_PROPERTY -}; +void source_collection_relink_many (SourceCollection* self, + GeeCollection* relink); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); +static void source_collection_real_remove_backlink (SourceCollection* self, + SourceBacklink* backlink); +gboolean data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink); +static void source_collection_real_items_unlinking (SourceCollection* self, + GeeCollection* unlinking); +static void source_collection_real_items_relinked (SourceCollection* self, + GeeCollection* relinked); +static void source_collection_real_item_destroyed (SourceCollection* self, + DataSource* source); +static void source_collection_real_items_destroyed (SourceCollection* self, + GeeCollection* destroyed); +static void source_collection_real_unlinked_destroyed (SourceCollection* self, + DataSource* source); +static void source_collection_real_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources); +static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void source_collection_destroy_counter_finalize (GObject * obj); static void source_collection_finalize (DataCollection * obj); -SourceCollection* source_collection_construct (GType object_type, const gchar* name) { +SourceCollection* +source_collection_construct (GType object_type, + const gchar* name) +{ SourceCollection* self = NULL; - const gchar* _tmp0_; #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = name; -#line 51 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - self = (SourceCollection*) data_collection_construct (object_type, _tmp0_); + self = (SourceCollection*) data_collection_construct (object_type, name); #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 350 "SourceCollection.c" +#line 451 "SourceCollection.c" } -static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source) { +static gboolean +source_collection_real_holds_type_of_source (SourceCollection* self, + DataSource* source) +{ gboolean _tmp0_ = FALSE; #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_critical ("Type `%s' does not implement abstract method `source_collection_holds_type_of_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return _tmp0_; -#line 360 "SourceCollection.c" +#line 464 "SourceCollection.c" } -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source) { +gboolean +source_collection_holds_type_of_source (SourceCollection* self, + DataSource* source) +{ #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->holds_type_of_source (self, source); -#line 369 "SourceCollection.c" +#line 476 "SourceCollection.c" } -static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { - GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking) +{ #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (unlinking)); #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = unlinking; -#line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, _tmp0_); -#line 381 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, unlinking); +#line 488 "SourceCollection.c" } -void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { +void +source_collection_notify_items_unlinking (SourceCollection* self, + GeeCollection* unlinking) +{ #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_unlinking (self, unlinking); -#line 390 "SourceCollection.c" +#line 500 "SourceCollection.c" } -static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { - GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked) +{ #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relinked)); #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = relinked; -#line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, _tmp0_); -#line 402 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, relinked); +#line 512 "SourceCollection.c" } -void source_collection_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { +void +source_collection_notify_items_relinked (SourceCollection* self, + GeeCollection* relinked) +{ #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_relinked (self, relinked); -#line 411 "SourceCollection.c" +#line 524 "SourceCollection.c" } -static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_; +static void +source_collection_real_notify_item_destroyed (SourceCollection* self, + DataSource* source) +{ #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = source; -#line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, _tmp0_); -#line 423 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, source); +#line 536 "SourceCollection.c" } -void source_collection_notify_item_destroyed (SourceCollection* self, DataSource* source) { +void +source_collection_notify_item_destroyed (SourceCollection* self, + DataSource* source) +{ #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_item_destroyed (self, source); -#line 432 "SourceCollection.c" +#line 548 "SourceCollection.c" } -static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { - GeeCollection* _tmp0_; +static void +source_collection_real_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed) +{ #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = destroyed; -#line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, _tmp0_); -#line 444 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, destroyed); +#line 560 "SourceCollection.c" } -void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { +void +source_collection_notify_items_destroyed (SourceCollection* self, + GeeCollection* destroyed) +{ #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_destroyed (self, destroyed); -#line 453 "SourceCollection.c" +#line 572 "SourceCollection.c" } -static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { - DataSource* _tmp0_; +static void +source_collection_real_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked) +{ #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (unlinked)); #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = unlinked; -#line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, _tmp0_); -#line 465 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, unlinked); +#line 584 "SourceCollection.c" } -void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { +void +source_collection_notify_unlinked_destroyed (SourceCollection* self, + DataSource* unlinked) +{ #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_unlinked_destroyed (self, unlinked); -#line 474 "SourceCollection.c" +#line 596 "SourceCollection.c" } -static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { - SourceBacklink* _tmp0_; - GeeCollection* _tmp1_; +static void +source_collection_real_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources) +{ #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = backlink; -#line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = sources; -#line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 491 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, backlink, sources); +#line 611 "SourceCollection.c" } -void source_collection_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { +void +source_collection_notify_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources) +{ #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_removed (self, backlink, sources); -#line 500 "SourceCollection.c" +#line 624 "SourceCollection.c" } -static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object) { +static gboolean +source_collection_real_valid_type (DataCollection* base, + DataObject* object) +{ SourceCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SOURCE_COLLECTION, SourceCollection); #line 82 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = object; -#line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_SOURCE); + result = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_DATA_SOURCE); #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 518 "SourceCollection.c" +#line 642 "SourceCollection.c" } -static gboolean _source_collection_destroy_and_delete_source_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_destroy_and_delete_source_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = source_collection_destroy_and_delete_source ((SourceCollection*) self, object, user); #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 527 "SourceCollection.c" +#line 655 "SourceCollection.c" } -static gboolean _source_collection_destroy_source_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_destroy_source_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = source_collection_destroy_source ((SourceCollection*) self, object, user); #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 536 "SourceCollection.c" +#line 668 "SourceCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 543 "SourceCollection.c" +#line 677 "SourceCollection.c" } -gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { +gint +source_collection_destroy_marked (SourceCollection* self, + Marker* marker, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed) +{ gint result = 0; SourceCollectionDestroyCounter* counter = NULL; Marker* _tmp0_; Marker* _tmp1_; SourceCollectionDestroyCounter* _tmp2_; SourceCollectionDestroyCounter* _tmp3_; - gboolean _tmp4_; - SourceCollectionDestroyCounter* _tmp24_; - GeeArrayList* _tmp25_; - SourceCollectionDestroyCounter* _tmp26_; - Marker* _tmp27_; - GeeList* _tmp28_; - SourceCollectionDestroyCounter* _tmp32_; - GeeArrayList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + SourceCollectionDestroyCounter* _tmp19_; + GeeArrayList* _tmp20_; + SourceCollectionDestroyCounter* _tmp21_; + Marker* _tmp22_; + SourceCollectionDestroyCounter* _tmp25_; + GeeArrayList* _tmp26_; + gint _tmp27_; + gint _tmp28_; #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), 0); #line 88 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -579,172 +718,148 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g #line 90 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" counter = _tmp3_; #line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = delete_backing; -#line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp4_) { -#line 586 "SourceCollection.c" - Marker* _tmp5_; - ProgressMonitor _tmp6_; - void* _tmp6__target; - SourceCollectionDestroyCounter* _tmp7_; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = marker; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = monitor; -#line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6__target = monitor_target; + if (delete_backing) { +#line 723 "SourceCollection.c" + SourceCollectionDestroyCounter* _tmp4_; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = counter; + _tmp4_ = counter; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_, _source_collection_destroy_and_delete_source_marked_action, self, _tmp6_, _tmp6__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject)); -#line 601 "SourceCollection.c" + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_destroy_and_delete_source_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject)); +#line 729 "SourceCollection.c" } else { - Marker* _tmp8_; - ProgressMonitor _tmp9_; - void* _tmp9__target; - SourceCollectionDestroyCounter* _tmp10_; + SourceCollectionDestroyCounter* _tmp5_; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = marker; + _tmp5_ = counter; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = monitor; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9__target = monitor_target; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = counter; -#line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_, _source_collection_destroy_source_marked_action, self, _tmp9_, _tmp9__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject)); -#line 617 "SourceCollection.c" + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_destroy_source_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_OBJECT, GObject)); +#line 736 "SourceCollection.c" } { GeeArrayList* _source_list = NULL; - SourceCollectionDestroyCounter* _tmp11_; - GeeArrayList* _tmp12_; - GeeArrayList* _tmp13_; + SourceCollectionDestroyCounter* _tmp6_; + GeeArrayList* _tmp7_; + GeeArrayList* _tmp8_; gint _source_size = 0; - GeeArrayList* _tmp14_; - gint _tmp15_; - gint _tmp16_; + GeeArrayList* _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _source_index = 0; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = counter; + _tmp6_ = counter; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = _tmp11_->notify_list; + _tmp7_ = _tmp6_->notify_list; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_list = _tmp13_; + _source_list = _tmp8_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = _source_list; + _tmp9_ = _source_list; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_size = _tmp16_; + _source_size = _tmp11_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _source_index = -1; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 649 "SourceCollection.c" - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; +#line 768 "SourceCollection.c" + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; DataSource* source = NULL; - GeeArrayList* _tmp20_; - gint _tmp21_; - gpointer _tmp22_; - DataSource* _tmp23_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + DataSource* _tmp18_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp17_ = _source_index; + _tmp12_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_index = _tmp17_ + 1; + _source_index = _tmp12_ + 1; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp18_ = _source_index; + _tmp13_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp19_ = _source_size; + _tmp14_ = _source_size; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!(_tmp18_ < _tmp19_)) { + if (!(_tmp13_ < _tmp14_)) { #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 670 "SourceCollection.c" +#line 789 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp20_ = _source_list; + _tmp15_ = _source_list; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp21_ = _source_index; + _tmp16_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp21_); + _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp22_; + source = (DataSource*) _tmp17_; #line 99 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp23_ = source; + _tmp18_ = source; #line 99 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_item_destroyed (self, _tmp23_); + source_collection_notify_item_destroyed (self, _tmp18_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 686 "SourceCollection.c" +#line 805 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 690 "SourceCollection.c" +#line 809 "SourceCollection.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp24_ = counter; + _tmp19_ = counter; #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp25_ = _tmp24_->notify_list; + _tmp20_ = _tmp19_->notify_list; #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_destroyed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); + source_collection_notify_items_destroyed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp26_ = counter; + _tmp21_ = counter; #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp27_ = _tmp26_->remove_marker; + _tmp22_ = _tmp21_->remove_marker; #line 103 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp27_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp22_); #line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp28_ = not_removed; -#line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (NULL != _tmp28_) { -#line 708 "SourceCollection.c" - GeeList* _tmp29_; - SourceCollectionDestroyCounter* _tmp30_; - GeeArrayList* _tmp31_; -#line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp29_ = not_removed; + if (NULL != not_removed) { +#line 825 "SourceCollection.c" + SourceCollectionDestroyCounter* _tmp23_; + GeeArrayList* _tmp24_; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp30_ = counter; + _tmp23_ = counter; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp31_ = _tmp30_->not_removed; + _tmp24_ = _tmp23_->not_removed; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 720 "SourceCollection.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (not_removed, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 834 "SourceCollection.c" } #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp32_ = counter; + _tmp25_ = counter; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp33_ = _tmp32_->not_removed; + _tmp26_ = _tmp25_->not_removed; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp35_ = _tmp34_; + _tmp28_ = _tmp27_; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - result = _tmp35_; + result = _tmp28_; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (counter); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 736 "SourceCollection.c" +#line 850 "SourceCollection.c" } -static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_destroy_and_delete_source (SourceCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; gboolean success = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; - gboolean _tmp10_ = FALSE; - DataObject* _tmp11_; - GObject* _tmp12_; - gboolean _tmp13_; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; + gboolean _tmp5_ = FALSE; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); @@ -754,25 +869,19 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 113 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = FALSE; -#line 758 "SourceCollection.c" +#line 873 "SourceCollection.c" { gboolean _tmp0_ = FALSE; - DataObject* _tmp1_; - gboolean _tmp2_; -#line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = object; -#line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = _tmp2_; + _tmp0_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource), &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 771 "SourceCollection.c" +#line 880 "SourceCollection.c" goto __catch53_g_error; } #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = _tmp0_; -#line 776 "SourceCollection.c" +#line 885 "SourceCollection.c" } goto __finally53; __catch53_g_error: @@ -786,90 +895,75 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s success = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_error_free0 (err); -#line 790 "SourceCollection.c" +#line 899 "SourceCollection.c" } __finally53: #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 795 "SourceCollection.c" - gboolean _tmp3_ = FALSE; +#line 904 "SourceCollection.c" + gboolean _tmp1_ = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_clear_error (&_inner_error_); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - return _tmp3_; -#line 803 "SourceCollection.c" + return _tmp1_; +#line 912 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = success; -#line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!_tmp5_) { -#line 809 "SourceCollection.c" - DataObject* _tmp6_; + _tmp3_ = success; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = object; + if (!_tmp3_) { #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE); -#line 815 "SourceCollection.c" + _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_MEDIA_SOURCE); +#line 920 "SourceCollection.c" } else { #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = FALSE; -#line 819 "SourceCollection.c" + _tmp2_ = FALSE; +#line 924 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp4_) { -#line 823 "SourceCollection.c" - GObject* _tmp7_; - GeeArrayList* _tmp8_; - DataObject* _tmp9_; -#line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = user; -#line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed; + if (_tmp2_) { +#line 928 "SourceCollection.c" + GeeArrayList* _tmp4_; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = object; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 835 "SourceCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_MEDIA_SOURCE, MediaSource)); +#line 934 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = object; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = user; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_); + if (source_collection_destroy_source (self, object, user)) { +#line 938 "SourceCollection.c" + gboolean _tmp6_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp13_) { -#line 845 "SourceCollection.c" - gboolean _tmp14_; + _tmp6_ = success; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = success; -#line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = _tmp14_; -#line 851 "SourceCollection.c" + _tmp5_ = _tmp6_; +#line 944 "SourceCollection.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = FALSE; -#line 855 "SourceCollection.c" + _tmp5_ = FALSE; +#line 948 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - result = _tmp10_; + result = _tmp5_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 861 "SourceCollection.c" +#line 954 "SourceCollection.c" } -static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_destroy_source (SourceCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - GObject* _tmp2_; - Marker* _tmp3_; - GObject* _tmp4_; - GeeArrayList* _tmp5_; + DataSource* _tmp0_; + Marker* _tmp1_; + GeeArrayList* _tmp2_; #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -877,60 +971,63 @@ static gboolean source_collection_destroy_source (SourceCollection* self, DataOb #line 127 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = object; -#line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource)); #line 128 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = _tmp1_; + source = _tmp0_; #line 130 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_internal_mark_for_destroy (source); #line 131 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_destroy (source); #line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = user; -#line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->remove_marker; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->remove_marker; #line 133 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - marker_mark (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = user; + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (user, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->notify_list; #line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->notify_list; -#line 134 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = TRUE; #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 908 "SourceCollection.c" +#line 996 "SourceCollection.c" } -static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_source_backlink_hash_func_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = source_backlink_hash_func ((SourceBacklink*) v); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 917 "SourceCollection.c" +#line 1008 "SourceCollection.c" } -static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_source_backlink_equal_func_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = source_backlink_equal_func ((SourceBacklink*) a, (SourceBacklink*) b); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 926 "SourceCollection.c" +#line 1021 "SourceCollection.c" } -void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { +void +source_collection_internal_backlink_set (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink) +{ GeeMultiMap* _tmp0_; GeeMultiMap* _tmp2_; - SourceBacklink* _tmp3_; - DataSource* _tmp4_; #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 140 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -941,7 +1038,7 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _tmp0_ = self->priv->backlinks; #line 141 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp0_ == NULL) { -#line 945 "SourceCollection.c" +#line 1042 "SourceCollection.c" GeeHashMultiMap* _tmp1_; #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _source_backlink_hash_func_gee_hash_data_func, NULL, NULL, _source_backlink_equal_func_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -949,27 +1046,24 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _g_object_unref0 (self->priv->backlinks); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 953 "SourceCollection.c" +#line 1050 "SourceCollection.c" } #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = backlink; -#line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = source; -#line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_multi_map_set (_tmp2_, _tmp3_, _tmp4_); -#line 963 "SourceCollection.c" + gee_multi_map_set (_tmp2_, backlink, source); +#line 1056 "SourceCollection.c" } -void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { +void +source_collection_internal_backlink_removed (SourceCollection* self, + DataSource* source, + SourceBacklink* backlink) +{ GeeMultiMap* _tmp0_; gboolean removed = FALSE; GeeMultiMap* _tmp1_; - SourceBacklink* _tmp2_; - DataSource* _tmp3_; - gboolean _tmp4_; #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 150 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -983,20 +1077,17 @@ void source_collection_internal_backlink_removed (SourceCollection* self, DataSo #line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = self->priv->backlinks; #line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = backlink; -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = source; -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = gee_multi_map_remove (_tmp1_, _tmp2_, _tmp3_); -#line 153 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - removed = _tmp4_; + removed = gee_multi_map_remove (_tmp1_, backlink, source); #line 154 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _vala_assert (removed, "removed"); -#line 996 "SourceCollection.c" +#line 1084 "SourceCollection.c" } -static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink) { +static gboolean +source_collection_real_has_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; GeeMultiMap* _tmp1_; @@ -1006,65 +1097,68 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou _tmp1_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp1_ != NULL) { -#line 1010 "SourceCollection.c" +#line 1101 "SourceCollection.c" GeeMultiMap* _tmp2_; - SourceBacklink* _tmp3_; - gboolean _tmp4_; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = backlink; -#line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = gee_multi_map_contains (_tmp2_, _tmp3_); -#line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = _tmp4_; -#line 1022 "SourceCollection.c" + _tmp0_ = gee_multi_map_contains (_tmp2_, backlink); +#line 1107 "SourceCollection.c" } else { #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = FALSE; -#line 1026 "SourceCollection.c" +#line 1111 "SourceCollection.c" } #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = _tmp0_; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1032 "SourceCollection.c" +#line 1117 "SourceCollection.c" } -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink) { +gboolean +source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->has_backlink (self, backlink); -#line 1041 "SourceCollection.c" +#line 1129 "SourceCollection.c" } -static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_source_collection_prepare_for_unlink_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = source_collection_prepare_for_unlink ((SourceCollection*) self, object, user); #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1050 "SourceCollection.c" +#line 1142 "SourceCollection.c" } -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target) { +GeeCollection* +source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target) +{ GeeCollection* result = NULL; GeeArrayList* list = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; - ProgressMonitor _tmp2_; - void* _tmp2__target; - GeeArrayList* _tmp3_; - GeeArrayList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - GeeArrayList* _tmp7_; - GeeArrayList* _tmp8_; - Marker* _tmp9_; - Marker* _tmp10_; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; + Marker* _tmp7_; + Marker* _tmp8_; #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), NULL); #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1074,59 +1168,55 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* #line 162 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" list = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = marker; + _tmp1_ = list; #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = monitor; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2__target = monitor_target; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = list; -#line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _source_collection_prepare_for_unlink_marked_action, self, _tmp2_, _tmp2__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _source_collection_prepare_for_unlink_marked_action, self, monitor, monitor_target, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject)); #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = list; + _tmp2_ = list; #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp6_ == 0) { + if (_tmp4_ == 0) { #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = NULL; #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (list); #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1101 "SourceCollection.c" +#line 1189 "SourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = list; + _tmp5_ = list; #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_unlinking (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + source_collection_notify_items_unlinking (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = list; + _tmp6_ = list; #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp10_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_); #line 170 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection); #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1121 "SourceCollection.c" +#line 1209 "SourceCollection.c" } -static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user) { +static gboolean +source_collection_prepare_for_unlink (SourceCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_; - DataSource* _tmp1_; - GObject* _tmp2_; + DataSource* _tmp0_; #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1134,209 +1224,179 @@ static gboolean source_collection_prepare_for_unlink (SourceCollection* self, Da #line 175 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_SOURCE, DataSource)); #line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); -#line 176 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = _tmp1_; + source = _tmp0_; #line 178 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_notify_unlinking (source, self); #line 179 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = user; -#line 179 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList), GEE_TYPE_COLLECTION, GeeCollection), source); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_LIST, GeeList), GEE_TYPE_COLLECTION, GeeCollection), source); #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = TRUE; #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1155 "SourceCollection.c" +#line 1241 "SourceCollection.c" } -void source_collection_relink (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_; - DataSource* _tmp1_; - DataSource* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; - DataSource* _tmp5_; +void +source_collection_relink (SourceCollection* self, + DataSource* source) +{ + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 184 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 185 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = source; -#line 185 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinking (_tmp0_, self); -#line 187 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = source; + data_source_notify_relinking (source, self); #line 187 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = source; + _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + source_collection_notify_items_relinked (self, _tmp1_); #line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_relinked (self, _tmp4_); -#line 188 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp4_); -#line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = source; + _g_object_unref0 (_tmp1_); #line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinked (_tmp5_); -#line 1192 "SourceCollection.c" + data_source_notify_relinked (source); +#line 1269 "SourceCollection.c" } -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink) { - GeeCollection* _tmp0_; +void +source_collection_relink_many (SourceCollection* self, + GeeCollection* relink) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - GeeCollection* _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - GeeCollection* _tmp13_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 193 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relink)); #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = relink; -#line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (relink); #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 194 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1218 "SourceCollection.c" +#line 1293 "SourceCollection.c" } { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = relink; + GeeIterator* _tmp2_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relink, GEE_TYPE_ITERABLE, GeeIterable)); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_it = _tmp4_; + _source_it = _tmp2_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1232 "SourceCollection.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 1304 "SourceCollection.c" + GeeIterator* _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - DataSource* _tmp9_; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataSource* _tmp6_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = _source_it; + _tmp3_ = _source_it; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1247 "SourceCollection.c" +#line 1316 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = _source_it; + _tmp4_ = _source_it; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp8_; + source = (DataSource*) _tmp5_; #line 198 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = source; + _tmp6_ = source; #line 198 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinking (_tmp9_, self); + data_source_notify_relinking (_tmp6_, self); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1261 "SourceCollection.c" +#line 1330 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1265 "SourceCollection.c" +#line 1334 "SourceCollection.c" } #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = relink; -#line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, NULL, NULL); + _tmp7_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), relink, NULL, NULL); #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp12_); -#line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = relink; + _g_object_unref0 (_tmp8_); #line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_items_relinked (self, _tmp13_); -#line 1279 "SourceCollection.c" + source_collection_notify_items_relinked (self, relink); +#line 1344 "SourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp14_; - GeeIterator* _tmp15_; + GeeIterator* _tmp9_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = relink; + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (relink, GEE_TYPE_ITERABLE, GeeIterable)); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_it = _tmp15_; + _source_it = _tmp9_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1292 "SourceCollection.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 1354 "SourceCollection.c" + GeeIterator* _tmp10_; DataSource* source = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - DataSource* _tmp20_; -#line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp16_ = _source_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataSource* _tmp13_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp17_ = gee_iterator_next (_tmp16_); + _tmp10_ = _source_it; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp10_)) { #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1307 "SourceCollection.c" +#line 1366 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp18_ = _source_it; + _tmp11_ = _source_it; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp19_; + source = (DataSource*) _tmp12_; #line 204 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp20_ = source; + _tmp13_ = source; #line 204 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_notify_relinked (_tmp20_); + data_source_notify_relinked (_tmp13_); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1321 "SourceCollection.c" +#line 1380 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1325 "SourceCollection.c" +#line 1384 "SourceCollection.c" } } -static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { +static void +source_collection_real_remove_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ GeeMultiMap* _tmp0_; GeeArrayList* sources = NULL; GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; GeeMultiMap* _tmp3_; - SourceBacklink* _tmp4_; + GeeCollection* _tmp4_; GeeCollection* _tmp5_; - GeeCollection* _tmp6_; - SourceBacklink* _tmp20_; - GeeArrayList* _tmp21_; + GeeArrayList* _tmp18_; #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 208 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1345,7 +1405,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour if (_tmp0_ == NULL) { #line 209 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1349 "SourceCollection.c" +#line 1409 "SourceCollection.c" } #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); @@ -1356,155 +1416,177 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp3_ = self->priv->backlinks; #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = backlink; -#line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = gee_multi_map_get (_tmp3_, _tmp4_); + _tmp4_ = gee_multi_map_get (_tmp3_, backlink); #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_array_list_add_all (_tmp2_, _tmp6_); + gee_array_list_add_all (_tmp2_, _tmp5_); #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _g_object_unref0 (_tmp6_); -#line 1369 "SourceCollection.c" + _g_object_unref0 (_tmp5_); +#line 1427 "SourceCollection.c" { GeeArrayList* _source_list = NULL; + GeeArrayList* _tmp6_; GeeArrayList* _tmp7_; - GeeArrayList* _tmp8_; gint _source_size = 0; - GeeArrayList* _tmp9_; + GeeArrayList* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; gint _source_index = 0; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = sources; + _tmp6_ = sources; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp7_ = _g_object_ref0 (_tmp6_); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_list = _tmp8_; + _source_list = _tmp7_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = _source_list; + _tmp8_ = _source_list; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_size = _tmp11_; + _source_size = _tmp10_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _source_index = -1; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1397 "SourceCollection.c" +#line 1455 "SourceCollection.c" + gint _tmp11_; gint _tmp12_; gint _tmp13_; - gint _tmp14_; DataSource* source = NULL; - GeeArrayList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; - DataSource* _tmp18_; - SourceBacklink* _tmp19_; + GeeArrayList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; + DataSource* _tmp17_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = _source_index; + _tmp11_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _source_index = _tmp12_ + 1; + _source_index = _tmp11_ + 1; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = _source_index; + _tmp12_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp14_ = _source_size; + _tmp13_ = _source_size; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp12_ < _tmp13_)) { #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1419 "SourceCollection.c" +#line 1476 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp15_ = _source_list; + _tmp14_ = _source_list; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp16_ = _source_index; + _tmp15_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); + _tmp16_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp15_); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source = (DataSource*) _tmp17_; + source = (DataSource*) _tmp16_; #line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp18_ = source; + _tmp17_ = source; #line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp19_ = backlink; -#line 216 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - data_source_remove_backlink (_tmp18_, _tmp19_); + data_source_remove_backlink (_tmp17_, backlink); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1437 "SourceCollection.c" +#line 1492 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 1441 "SourceCollection.c" +#line 1496 "SourceCollection.c" } #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp20_ = backlink; -#line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp21_ = sources; + _tmp18_ = sources; #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - source_collection_notify_backlink_removed (self, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); + source_collection_notify_backlink_removed (self, backlink, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (sources); -#line 1451 "SourceCollection.c" +#line 1504 "SourceCollection.c" } -void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { +void +source_collection_remove_backlink (SourceCollection* self, + SourceBacklink* backlink) +{ #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->remove_backlink (self, backlink); -#line 1460 "SourceCollection.c" +#line 1516 "SourceCollection.c" } -static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { +static void +source_collection_real_items_unlinking (SourceCollection* self, + GeeCollection* unlinking) +{ #line 20 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (unlinking)); -#line 1467 "SourceCollection.c" +#line 1526 "SourceCollection.c" } -static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked) { +static void +source_collection_real_items_relinked (SourceCollection* self, + GeeCollection* relinked) +{ #line 25 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relinked)); -#line 1474 "SourceCollection.c" +#line 1536 "SourceCollection.c" } -static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source) { +static void +source_collection_real_item_destroyed (SourceCollection* self, + DataSource* source) +{ #line 30 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1481 "SourceCollection.c" +#line 1546 "SourceCollection.c" } -static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { +static void +source_collection_real_items_destroyed (SourceCollection* self, + GeeCollection* destroyed) +{ #line 35 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 1488 "SourceCollection.c" +#line 1556 "SourceCollection.c" } -static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source) { +static void +source_collection_real_unlinked_destroyed (SourceCollection* self, + DataSource* source) +{ #line 40 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1495 "SourceCollection.c" +#line 1566 "SourceCollection.c" } -static void source_collection_real_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { +static void +source_collection_real_backlink_removed (SourceCollection* self, + SourceBacklink* backlink, + GeeCollection* sources) +{ #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 1504 "SourceCollection.c" +#line 1579 "SourceCollection.c" } -static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT callback; register GCClosure * cc; @@ -1519,61 +1601,67 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1523 "SourceCollection.c" +#line 1605 "SourceCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = closure->data; -#line 1529 "SourceCollection.c" +#line 1611 "SourceCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback = (GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback (data1, value_get_source_backlink (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1535 "SourceCollection.c" +#line 1617 "SourceCollection.c" } -static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker) { +static SourceCollectionDestroyCounter* +source_collection_destroy_counter_construct (GType object_type, + Marker* remove_marker) +{ SourceCollectionDestroyCounter * self = NULL; Marker* _tmp0_; - Marker* _tmp1_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_MARKER (remove_marker), NULL); #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = (SourceCollectionDestroyCounter*) g_object_new (object_type, NULL); #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = remove_marker; -#line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (remove_marker); #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (self->remove_marker); #line 14 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - self->remove_marker = _tmp1_; + self->remove_marker = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 1557 "SourceCollection.c" +#line 1639 "SourceCollection.c" } -static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker) { +static SourceCollectionDestroyCounter* +source_collection_destroy_counter_new (Marker* remove_marker) +{ #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return source_collection_destroy_counter_construct (SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, remove_marker); -#line 1564 "SourceCollection.c" +#line 1648 "SourceCollection.c" } -static void source_collection_destroy_counter_class_init (SourceCollectionDestroyCounterClass * klass) { +static void +source_collection_destroy_counter_class_init (SourceCollectionDestroyCounterClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_destroy_counter_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (klass)->finalize = source_collection_destroy_counter_finalize; -#line 1573 "SourceCollection.c" +#line 1659 "SourceCollection.c" } -static void source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) { +static void +source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1584,11 +1672,13 @@ static void source_collection_destroy_counter_instance_init (SourceCollectionDes _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 11 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->not_removed = _tmp1_; -#line 1588 "SourceCollection.c" +#line 1676 "SourceCollection.c" } -static void source_collection_destroy_counter_finalize (GObject * obj) { +static void +source_collection_destroy_counter_finalize (GObject * obj) +{ SourceCollectionDestroyCounter * self; #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter); @@ -1600,11 +1690,13 @@ static void source_collection_destroy_counter_finalize (GObject * obj) { _g_object_unref0 (self->not_removed); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (source_collection_destroy_counter_parent_class)->finalize (obj); -#line 1604 "SourceCollection.c" +#line 1694 "SourceCollection.c" } -static GType source_collection_destroy_counter_get_type (void) { +static GType +source_collection_destroy_counter_get_type (void) +{ static volatile gsize source_collection_destroy_counter_type_id__volatile = 0; if (g_once_init_enter (&source_collection_destroy_counter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SourceCollectionDestroyCounterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) source_collection_destroy_counter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SourceCollectionDestroyCounter), 0, (GInstanceInitFunc) source_collection_destroy_counter_instance_init, NULL }; @@ -1616,7 +1708,9 @@ static GType source_collection_destroy_counter_get_type (void) { } -static void source_collection_class_init (SourceCollectionClass * klass) { +static void +source_collection_class_init (SourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1667,20 +1761,24 @@ static void source_collection_class_init (SourceCollectionClass * klass) { source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL] = g_signal_new ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL] = g_signal_new ("backlink-removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION); -#line 1671 "SourceCollection.c" +#line 1765 "SourceCollection.c" } -static void source_collection_instance_init (SourceCollection * self) { +static void +source_collection_instance_init (SourceCollection * self) +{ #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv = SOURCE_COLLECTION_GET_PRIVATE (self); #line 48 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = NULL; -#line 1680 "SourceCollection.c" +#line 1776 "SourceCollection.c" } -static void source_collection_finalize (DataCollection * obj) { +static void +source_collection_finalize (DataCollection * obj) +{ SourceCollection * self; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_COLLECTION, SourceCollection); @@ -1688,11 +1786,13 @@ static void source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->backlinks); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" DATA_COLLECTION_CLASS (source_collection_parent_class)->finalize (obj); -#line 1692 "SourceCollection.c" +#line 1790 "SourceCollection.c" } -GType source_collection_get_type (void) { +GType +source_collection_get_type (void) +{ static volatile gsize source_collection_type_id__volatile = 0; if (g_once_init_enter (&source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SourceCollection), 0, (GInstanceInitFunc) source_collection_instance_init, NULL }; diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c index 7d92788..809af37 100644 --- a/src/core/SourceHoldingTank.c +++ b/src/core/SourceHoldingTank.c @@ -1,4 +1,4 @@ -/* SourceHoldingTank.c generated by valac 0.36.6, the Vala compiler +/* SourceHoldingTank.c generated by valac 0.40.4, the Vala compiler * generated from SourceHoldingTank.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -23,6 +23,7 @@ /* moved into more than one holding tank, or which should have preference. The CheckToRemove*/ /* predicate is offered only to know when to release them.*/ + #include #include #include @@ -136,9 +137,9 @@ typedef struct _SingletonCollectionClass SingletonCollectionClass; typedef struct _ParamSpecSourceHoldingTank ParamSpecSourceHoldingTank; enum { SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL, - SOURCE_HOLDING_TANK_LAST_SIGNAL + SOURCE_HOLDING_TANK_NUM_SIGNALS }; -static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_LAST_SIGNAL] = {0}; +static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_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; } @@ -190,316 +191,392 @@ static gpointer source_holding_tank_parent_class = NULL; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; 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; 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 SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTankPrivate)) -enum { - SOURCE_HOLDING_TANK_DUMMY_PROPERTY -}; -static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source); -static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, + DataSource* source); +static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self); -static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self); +static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, + gpointer self); DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); -SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target); -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); -static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); -void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank); +SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +SourceHoldingTank* source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target); +void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); +static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed); +void data_source_notify_held_in_tank (DataSource* self, + SourceHoldingTank* holding_tank); gint source_holding_tank_get_count (SourceHoldingTank* self); gint data_set_get_count (DataSet* self); GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self); GeeList* data_set_get_all (DataSet* self); -gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source); -gboolean data_set_contains (DataSet* self, DataObject* object); -void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many); -void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink); +gboolean source_holding_tank_contains (SourceHoldingTank* self, + DataSource* source); +gboolean data_set_contains (DataSet* self, + DataObject* object); +void source_holding_tank_add_many (SourceHoldingTank* self, + GeeCollection* many); +void data_object_internal_set_ordinal (DataObject* self, + gint64 ordinal); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, + GeeCollection* unlink); GType marker_get_type (void) G_GNUC_CONST; -GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); +GeeCollection* source_collection_unlink_marked (SourceCollection* self, + Marker* marker, + ProgressMonitor monitor, + void* monitor_target); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; -gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -DataObject* data_set_get_at (DataSet* self, gint index); -gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink); -void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink); -gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink); -void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed); -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects); -gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); -gboolean data_set_remove (DataSet* self, 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); +gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +DataObject* data_set_get_at (DataSet* self, + gint index); +gboolean data_source_has_backlink (DataSource* self, + SourceBacklink* backlink); +void source_holding_tank_remove_backlink (SourceHoldingTank* self, + SourceBacklink* backlink); +gboolean data_source_remove_backlink (DataSource* self, + SourceBacklink* backlink); +void source_holding_tank_destroy_orphans (SourceHoldingTank* self, + GeeList* destroy, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed); +gboolean data_set_remove_many (DataSet* self, + GeeCollection* objects); +gboolean data_source_destroy_orphan (DataSource* self, + gboolean delete_backing); +gboolean data_set_remove (DataSet* self, + 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); GType singleton_collection_get_type (void) G_GNUC_CONST; -void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration); +void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, + DataSource* source, + Alteration* alteration); gchar* data_object_to_string (DataObject* self); gchar* source_holding_tank_to_string (SourceHoldingTank* self); gboolean data_collection_are_notifications_frozen (DataCollection* self); -void source_collection_relink (SourceCollection* self, DataSource* source); -void source_collection_relink_many (SourceCollection* self, GeeCollection* relink); -static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* 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); +void source_collection_relink (SourceCollection* self, + DataSource* source); +void source_collection_relink_many (SourceCollection* self, + GeeCollection* relink); +static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* 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 source_holding_tank_finalize (SourceHoldingTank * obj); -static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_on_source_destroyed ((SourceHoldingTank*) self, source); -#line 284 "SourceHoldingTank.c" +#line 371 "SourceHoldingTank.c" } -static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) { +static void +_source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_on_source_collection_thawed ((SourceHoldingTank*) self); -#line 291 "SourceHoldingTank.c" +#line 381 "SourceHoldingTank.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return self ? data_collection_ref (self) : NULL; -#line 298 "SourceHoldingTank.c" +#line 390 "SourceHoldingTank.c" } -SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) { +SourceHoldingTank* +source_holding_tank_construct (GType object_type, + SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target) +{ SourceHoldingTank* self = NULL; SourceCollection* _tmp0_; SourceCollection* _tmp1_; - SourceHoldingTankCheckToKeep _tmp2_; - void* _tmp2__target; - SourceCollection* _tmp3_; - SourceCollection* _tmp4_; + SourceCollection* _tmp2_; #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" self = (SourceHoldingTank*) g_type_create_instance (object_type); #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = sources; -#line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (sources); #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _data_collection_unref0 (self->priv->sources); #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->sources = _tmp1_; -#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = check_to_keep; -#line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2__target = check_to_keep_target; + self->priv->sources = _tmp0_; #line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->check_to_keep = _tmp2_; + self->priv->check_to_keep = check_to_keep; #line 41 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->check_to_keep_target = _tmp2__target; + self->priv->check_to_keep_target = check_to_keep_target; #line 43 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->sources; + _tmp1_ = self->priv->sources; #line 43 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - g_signal_connect (_tmp3_, "item-destroyed", (GCallback) _source_holding_tank_on_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (_tmp1_, "item-destroyed", (GCallback) _source_holding_tank_on_source_destroyed_source_collection_item_destroyed, self); #line 44 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = self->priv->sources; + _tmp2_ = self->priv->sources; #line 44 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self); #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return self; -#line 340 "SourceHoldingTank.c" +#line 428 "SourceHoldingTank.c" } -SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) { +SourceHoldingTank* +source_holding_tank_new (SourceCollection* sources, + SourceHoldingTankCheckToKeep check_to_keep, + void* check_to_keep_target) +{ #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return source_holding_tank_construct (TYPE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target); -#line 347 "SourceHoldingTank.c" +#line 439 "SourceHoldingTank.c" } -static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_; - GeeCollection* _tmp8_; - GeeCollection* _tmp16_; - GeeCollection* _tmp17_; +static void +source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); #line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = added; -#line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp0_ != NULL) { -#line 364 "SourceHoldingTank.c" + if (added != NULL) { +#line 454 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable)); #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp2_; + _source_it = _tmp0_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 377 "SourceHoldingTank.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 464 "SourceHoldingTank.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataSource* _tmp7_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataSource* _tmp4_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = _source_it; + _tmp1_ = _source_it; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 392 "SourceHoldingTank.c" +#line 476 "SourceHoldingTank.c" } #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = _source_it; + _tmp2_ = _source_it; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp6_; + source = (DataSource*) _tmp3_; #line 56 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = source; + _tmp4_ = source; #line 56 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_source_notify_held_in_tank (_tmp7_, self); + data_source_notify_held_in_tank (_tmp4_, self); #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 406 "SourceHoldingTank.c" +#line 490 "SourceHoldingTank.c" } #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 410 "SourceHoldingTank.c" +#line 494 "SourceHoldingTank.c" } } #line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = removed; -#line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp8_ != NULL) { -#line 417 "SourceHoldingTank.c" + if (removed != NULL) { +#line 499 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; -#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = removed; + GeeIterator* _tmp5_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable)); #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp10_; + _source_it = _tmp5_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 430 "SourceHoldingTank.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 509 "SourceHoldingTank.c" + GeeIterator* _tmp6_; DataSource* source = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - DataSource* _tmp15_; -#line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = _source_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataSource* _tmp9_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = gee_iterator_next (_tmp11_); + _tmp6_ = _source_it; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp6_)) { #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 445 "SourceHoldingTank.c" +#line 521 "SourceHoldingTank.c" } #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = _source_it; + _tmp7_ = _source_it; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp14_; + source = (DataSource*) _tmp8_; #line 61 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = source; + _tmp9_ = source; #line 61 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_source_notify_held_in_tank (_tmp15_, NULL); + data_source_notify_held_in_tank (_tmp9_, NULL); #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 459 "SourceHoldingTank.c" +#line 535 "SourceHoldingTank.c" } #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 463 "SourceHoldingTank.c" +#line 539 "SourceHoldingTank.c" } } #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = added; -#line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = removed; -#line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, _tmp16_, _tmp17_); -#line 472 "SourceHoldingTank.c" + g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, added, removed); +#line 544 "SourceHoldingTank.c" } -void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) { +void +source_holding_tank_notify_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" SOURCE_HOLDING_TANK_GET_CLASS (self)->notify_contents_altered (self, added, removed); -#line 481 "SourceHoldingTank.c" +#line 557 "SourceHoldingTank.c" } -gint source_holding_tank_get_count (SourceHoldingTank* self) { +gint +source_holding_tank_get_count (SourceHoldingTank* self) +{ gint result = 0; DataSet* _tmp0_; - gint _tmp1_; #line 67 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), 0); #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - result = _tmp1_; + result = data_set_get_count (_tmp0_); #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 499 "SourceHoldingTank.c" +#line 574 "SourceHoldingTank.c" } -GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) { +GeeCollection* +source_holding_tank_get_all (SourceHoldingTank* self) +{ GeeCollection* result = NULL; DataSet* _tmp0_; GeeList* _tmp1_; @@ -513,16 +590,17 @@ GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 517 "SourceHoldingTank.c" +#line 594 "SourceHoldingTank.c" } -gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source) { +gboolean +source_holding_tank_contains (SourceHoldingTank* self, + DataSource* source) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; DataSet* _tmp1_; - DataSource* _tmp2_; - gboolean _tmp3_; #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE); #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -530,279 +608,232 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp1_ = self->priv->tank; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = source; -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = data_set_contains (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp3_) { + if (data_set_contains (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) { #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = TRUE; -#line 541 "SourceHoldingTank.c" +#line 615 "SourceHoldingTank.c" } else { - GeeHashSet* _tmp4_; - DataSource* _tmp5_; - gboolean _tmp6_; -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = self->priv->unlinking; -#line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = source; + GeeHashSet* _tmp2_; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); + _tmp2_ = self->priv->unlinking; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = _tmp6_; -#line 554 "SourceHoldingTank.c" + _tmp0_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); +#line 622 "SourceHoldingTank.c" } #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" result = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 560 "SourceHoldingTank.c" +#line 628 "SourceHoldingTank.c" } -void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) { - GeeCollection* _tmp0_; +void +source_holding_tank_add_many (SourceHoldingTank* self, + GeeCollection* many) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp11_; - GeeCollection* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; - GeeCollection* _tmp15_; + DataSet* _tmp8_; + gboolean _tmp9_; #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (GEE_IS_COLLECTION (many)); #line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = many; -#line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (many); #line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 82 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 588 "SourceHoldingTank.c" +#line 653 "SourceHoldingTank.c" } { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = many; + GeeIterator* _tmp2_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (many, GEE_TYPE_ITERABLE, GeeIterable)); #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp4_; + _source_it = _tmp2_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 602 "SourceHoldingTank.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 664 "SourceHoldingTank.c" + GeeIterator* _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - DataSource* _tmp9_; - gint64 _tmp10_; -#line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = _source_it; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataSource* _tmp6_; + gint64 _tmp7_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _source_it; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 618 "SourceHoldingTank.c" +#line 677 "SourceHoldingTank.c" } #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = _source_it; + _tmp4_ = _source_it; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp8_; + source = (DataSource*) _tmp5_; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = source; + _tmp6_ = source; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = self->priv->ordinal; + _tmp7_ = self->priv->ordinal; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->ordinal = _tmp10_ + 1; + self->priv->ordinal = _tmp7_ + 1; #line 85 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject), _tmp10_); + data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject), _tmp7_); #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 636 "SourceHoldingTank.c" +#line 695 "SourceHoldingTank.c" } #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 640 "SourceHoldingTank.c" +#line 699 "SourceHoldingTank.c" } #line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = self->priv->tank; -#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = many; -#line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = data_set_add_many (_tmp11_, _tmp12_); + _tmp8_ = self->priv->tank; #line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - added = _tmp13_; + added = data_set_add_many (_tmp8_, many); #line 88 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = added; + _tmp9_ = added; #line 88 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp14_, "added"); + _vala_assert (_tmp9_, "added"); #line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = many; -#line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, _tmp15_, NULL); -#line 658 "SourceHoldingTank.c" + source_holding_tank_notify_contents_altered (self, many, NULL); +#line 711 "SourceHoldingTank.c" } -void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink) { - GeeCollection* _tmp0_; +void +source_holding_tank_unlink_and_hold (SourceHoldingTank* self, + GeeCollection* unlink) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - GeeHashSet* _tmp3_; - GeeCollection* _tmp4_; - SourceCollection* _tmp5_; - SourceCollection* _tmp6_; + GeeHashSet* _tmp2_; + SourceCollection* _tmp3_; + SourceCollection* _tmp4_; + Marker* _tmp5_; + Marker* _tmp6_; GeeCollection* _tmp7_; - Marker* _tmp8_; - Marker* _tmp9_; - GeeCollection* _tmp10_; - GeeCollection* _tmp11_; + GeeCollection* _tmp8_; gboolean added = FALSE; - DataSet* _tmp20_; - GeeCollection* _tmp21_; - gboolean _tmp22_; - gboolean _tmp23_; - GeeHashSet* _tmp24_; - GeeCollection* _tmp25_; - GeeCollection* _tmp26_; + DataSet* _tmp15_; + gboolean _tmp16_; + GeeHashSet* _tmp17_; #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (GEE_IS_COLLECTION (unlink)); #line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = unlink; -#line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (unlink); #line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 96 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 97 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 697 "SourceHoldingTank.c" +#line 744 "SourceHoldingTank.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->unlinking; -#line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = unlink; + _tmp2_ = self->priv->unlinking; #line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), unlink); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = self->priv->sources; -#line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = self->priv->sources; + _tmp3_ = self->priv->sources; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = unlink; + _tmp4_ = self->priv->sources; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); + _tmp5_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), unlink); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = source_collection_unlink_marked (_tmp5_, _tmp9_, NULL, NULL); + _tmp7_ = source_collection_unlink_marked (_tmp3_, _tmp6_, NULL, NULL); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 723 "SourceHoldingTank.c" + _g_object_unref0 (_tmp6_); +#line 766 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp12_; - GeeIterator* _tmp13_; -#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = unlink; + GeeIterator* _tmp9_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (unlink, GEE_TYPE_ITERABLE, GeeIterable)); #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _source_it = _tmp13_; + _source_it = _tmp9_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 736 "SourceHoldingTank.c" - GeeIterator* _tmp14_; - gboolean _tmp15_; +#line 776 "SourceHoldingTank.c" + GeeIterator* _tmp10_; DataSource* source = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; - DataSource* _tmp18_; - gint64 _tmp19_; -#line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = _source_it; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataSource* _tmp13_; + gint64 _tmp14_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = gee_iterator_next (_tmp14_); + _tmp10_ = _source_it; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp10_)) { #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 752 "SourceHoldingTank.c" +#line 789 "SourceHoldingTank.c" } #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = _source_it; + _tmp11_ = _source_it; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp17_; + source = (DataSource*) _tmp12_; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp18_ = source; + _tmp13_ = source; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp19_ = self->priv->ordinal; + _tmp14_ = self->priv->ordinal; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - self->priv->ordinal = _tmp19_ + 1; + self->priv->ordinal = _tmp14_ + 1; #line 105 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), _tmp19_); + data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 770 "SourceHoldingTank.c" +#line 807 "SourceHoldingTank.c" } #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 774 "SourceHoldingTank.c" +#line 811 "SourceHoldingTank.c" } #line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp20_ = self->priv->tank; -#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp21_ = unlink; -#line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp22_ = data_set_add_many (_tmp20_, _tmp21_); + _tmp15_ = self->priv->tank; #line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - added = _tmp22_; + added = data_set_add_many (_tmp15_, unlink); #line 108 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp23_ = added; + _tmp16_ = added; #line 108 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp23_, "added"); -#line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24_ = self->priv->unlinking; + _vala_assert (_tmp16_, "added"); #line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25_ = unlink; + _tmp17_ = self->priv->unlinking; #line 111 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), unlink); #line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp26_ = unlink; -#line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, _tmp26_, NULL); -#line 798 "SourceHoldingTank.c" + source_holding_tank_notify_contents_altered (self, unlink, NULL); +#line 827 "SourceHoldingTank.c" } -gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink) { +gboolean +source_holding_tank_has_backlink (SourceHoldingTank* self, + SourceBacklink* backlink) +{ gboolean result = FALSE; gint count = 0; DataSet* _tmp0_; - gint _tmp1_; #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE); #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -810,76 +841,68 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli #line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - count = _tmp1_; -#line 817 "SourceHoldingTank.c" + count = data_set_get_count (_tmp0_); +#line 846 "SourceHoldingTank.c" { gint ctr = 0; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 822 "SourceHoldingTank.c" +#line 851 "SourceHoldingTank.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 829 "SourceHoldingTank.c" +#line 858 "SourceHoldingTank.c" + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - DataSet* _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; - DataSource* _tmp9_; - SourceBacklink* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; + DataSet* _tmp5_; + gint _tmp6_; + DataObject* _tmp7_; + DataSource* _tmp8_; + gboolean _tmp9_; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { -#line 841 "SourceHoldingTank.c" - gint _tmp3_; + if (!_tmp1_) { +#line 868 "SourceHoldingTank.c" + gint _tmp2_; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = ctr; + _tmp2_ = ctr; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - ctr = _tmp3_ + 1; -#line 847 "SourceHoldingTank.c" + ctr = _tmp2_ + 1; +#line 874 "SourceHoldingTank.c" } #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = count; + _tmp4_ = count; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!(_tmp4_ < _tmp5_)) { + if (!(_tmp3_ < _tmp4_)) { #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 859 "SourceHoldingTank.c" +#line 886 "SourceHoldingTank.c" } #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = self->priv->tank; -#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = ctr; + _tmp5_ = self->priv->tank; #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = data_set_get_at (_tmp6_, _tmp7_); + _tmp6_ = ctr; #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource); + _tmp7_ = data_set_get_at (_tmp5_, _tmp6_); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = backlink; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = data_source_has_backlink (_tmp9_, _tmp10_); + _tmp9_ = data_source_has_backlink (_tmp8_, backlink); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = _tmp11_; + _g_object_unref0 (_tmp8_); #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp12_) { + if (_tmp9_) { #line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" result = TRUE; #line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 883 "SourceHoldingTank.c" +#line 906 "SourceHoldingTank.c" } } } @@ -888,14 +911,16 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli result = FALSE; #line 123 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 892 "SourceHoldingTank.c" +#line 915 "SourceHoldingTank.c" } -void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink) { +void +source_holding_tank_remove_backlink (SourceHoldingTank* self, + SourceBacklink* backlink) +{ gint count = 0; DataSet* _tmp0_; - gint _tmp1_; #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -903,86 +928,83 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin #line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - count = _tmp1_; -#line 910 "SourceHoldingTank.c" + count = data_set_get_count (_tmp0_); +#line 933 "SourceHoldingTank.c" { gint ctr = 0; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 915 "SourceHoldingTank.c" +#line 938 "SourceHoldingTank.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 922 "SourceHoldingTank.c" +#line 945 "SourceHoldingTank.c" + gint _tmp3_; gint _tmp4_; - gint _tmp5_; - DataSet* _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; - DataSource* _tmp9_; - SourceBacklink* _tmp10_; + DataSet* _tmp5_; + gint _tmp6_; + DataObject* _tmp7_; + DataSource* _tmp8_; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { -#line 932 "SourceHoldingTank.c" - gint _tmp3_; + if (!_tmp1_) { +#line 954 "SourceHoldingTank.c" + gint _tmp2_; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = ctr; + _tmp2_ = ctr; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - ctr = _tmp3_ + 1; -#line 938 "SourceHoldingTank.c" + ctr = _tmp2_ + 1; +#line 960 "SourceHoldingTank.c" } #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = count; + _tmp4_ = count; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!(_tmp4_ < _tmp5_)) { + if (!(_tmp3_ < _tmp4_)) { #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 950 "SourceHoldingTank.c" +#line 972 "SourceHoldingTank.c" } #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = self->priv->tank; + _tmp5_ = self->priv->tank; #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = ctr; + _tmp6_ = ctr; #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = data_set_get_at (_tmp6_, _tmp7_); + _tmp7_ = data_set_get_at (_tmp5_, _tmp6_); #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource); #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = backlink; + data_source_remove_backlink (_tmp8_, backlink); #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - data_source_remove_backlink (_tmp9_, _tmp10_); -#line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 966 "SourceHoldingTank.c" + _g_object_unref0 (_tmp8_); +#line 986 "SourceHoldingTank.c" } } } } -void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { - GeeList* _tmp0_; +void +source_holding_tank_destroy_orphans (SourceHoldingTank* self, + GeeList* destroy, + gboolean delete_backing, + ProgressMonitor monitor, + void* monitor_target, + GeeList* not_removed) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_; - GeeList* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - GeeList* _tmp7_; + DataSet* _tmp2_; + gboolean _tmp3_; gint count = 0; - GeeList* _tmp8_; - gint _tmp9_; - gint _tmp10_; + gint _tmp4_; + gint _tmp5_; #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -990,165 +1012,125 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed)); #line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp0_ = destroy; -#line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp0_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 135 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1003 "SourceHoldingTank.c" +#line 1023 "SourceHoldingTank.c" } #line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->tank; + _tmp2_ = self->priv->tank; #line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = destroy; -#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = data_set_remove_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - removed = _tmp5_; + removed = data_set_remove_many (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 138 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = removed; + _tmp3_ = removed; #line 138 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp6_, "removed"); -#line 140 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = destroy; + _vala_assert (_tmp3_, "removed"); #line 140 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = destroy; + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (destroy, GEE_TYPE_COLLECTION, GeeCollection)); #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = _tmp4_; #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = _tmp9_; -#line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - count = _tmp10_; -#line 1029 "SourceHoldingTank.c" + count = _tmp5_; +#line 1041 "SourceHoldingTank.c" { gint ctr = 0; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 1034 "SourceHoldingTank.c" +#line 1046 "SourceHoldingTank.c" { - gboolean _tmp11_ = FALSE; + gboolean _tmp6_ = FALSE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = TRUE; + _tmp6_ = TRUE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 1041 "SourceHoldingTank.c" - gint _tmp13_; - gint _tmp14_; +#line 1053 "SourceHoldingTank.c" + gint _tmp8_; + gint _tmp9_; DataSource* source = NULL; - GeeList* _tmp15_; - gint _tmp16_; - gpointer _tmp17_; - DataSource* _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; - ProgressMonitor _tmp24_; - void* _tmp24__target; + gint _tmp10_; + gpointer _tmp11_; + DataSource* _tmp12_; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp11_) { -#line 1055 "SourceHoldingTank.c" - gint _tmp12_; + if (!_tmp6_) { +#line 1062 "SourceHoldingTank.c" + gint _tmp7_; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = ctr; + _tmp7_ = ctr; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - ctr = _tmp12_ + 1; -#line 1061 "SourceHoldingTank.c" + ctr = _tmp7_ + 1; +#line 1068 "SourceHoldingTank.c" } #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = FALSE; + _tmp6_ = FALSE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = ctr; + _tmp8_ = ctr; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = count; + _tmp9_ = count; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!(_tmp13_ < _tmp14_)) { + if (!(_tmp8_ < _tmp9_)) { #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 1073 "SourceHoldingTank.c" +#line 1080 "SourceHoldingTank.c" } #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = destroy; -#line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = ctr; + _tmp10_ = ctr; #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = gee_list_get (_tmp15_, _tmp16_); + _tmp11_ = gee_list_get (destroy, _tmp10_); #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source = (DataSource*) _tmp17_; -#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp18_ = source; -#line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp19_ = delete_backing; + source = (DataSource*) _tmp11_; #line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp20_ = data_source_destroy_orphan (_tmp18_, _tmp19_); + _tmp12_ = source; #line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp20_) { -#line 1091 "SourceHoldingTank.c" - GeeList* _tmp21_; + if (!data_source_destroy_orphan (_tmp12_, delete_backing)) { #line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp21_ = not_removed; -#line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (NULL != _tmp21_) { -#line 1097 "SourceHoldingTank.c" - GeeList* _tmp22_; - DataSource* _tmp23_; -#line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp22_ = not_removed; + if (NULL != not_removed) { +#line 1094 "SourceHoldingTank.c" + DataSource* _tmp13_; #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp23_ = source; + _tmp13_ = source; #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 1106 "SourceHoldingTank.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (not_removed, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); +#line 1100 "SourceHoldingTank.c" } } #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24_ = monitor; -#line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24__target = monitor_target; -#line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp24_ != NULL) { -#line 1115 "SourceHoldingTank.c" - ProgressMonitor _tmp25_; - void* _tmp25__target; - gint _tmp26_; - gint _tmp27_; + if (monitor != NULL) { +#line 1105 "SourceHoldingTank.c" + gint _tmp14_; + gint _tmp15_; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25_ = monitor; + _tmp14_ = ctr; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25__target = monitor_target; + _tmp15_ = count; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp26_ = ctr; -#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp27_ = count; -#line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp25_ ((guint64) (_tmp26_ + 1), (guint64) _tmp27_, TRUE, _tmp25__target); -#line 1130 "SourceHoldingTank.c" + monitor ((guint64) (_tmp14_ + 1), (guint64) _tmp15_, TRUE, monitor_target); +#line 1114 "SourceHoldingTank.c" } #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 1134 "SourceHoldingTank.c" +#line 1118 "SourceHoldingTank.c" } } } } -static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source) { +static void +source_holding_tank_on_source_destroyed (SourceHoldingTank* self, + DataSource* source) +{ DataSet* _tmp0_; - DataSource* _tmp1_; - gboolean _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_; - DataSource* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; - DataSource* _tmp7_; - SingletonCollection* _tmp8_; - SingletonCollection* _tmp9_; + DataSet* _tmp1_; + gboolean _tmp2_; + SingletonCollection* _tmp3_; + SingletonCollection* _tmp4_; #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1156,62 +1138,46 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da #line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = source; -#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 156 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { + if (!data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) { #line 157 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1167 "SourceHoldingTank.c" +#line 1145 "SourceHoldingTank.c" } #line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = self->priv->tank; -#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = source; -#line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = data_set_remove (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = self->priv->tank; #line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - removed = _tmp5_; + removed = data_set_remove (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 160 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = removed; + _tmp2_ = removed; #line 160 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp6_, "removed"); -#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = source; + _vala_assert (_tmp2_, "removed"); #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp7_); + _tmp3_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, source); #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp9_); -#line 1191 "SourceHoldingTank.c" + _g_object_unref0 (_tmp4_); +#line 1163 "SourceHoldingTank.c" } -void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration) { +void +source_holding_tank_internal_notify_altered (SourceHoldingTank* self, + DataSource* source, + Alteration* alteration) +{ DataSet* _tmp0_; - DataSource* _tmp1_; - gboolean _tmp2_; - SourceHoldingTankCheckToKeep _tmp8_; - void* _tmp8__target; - DataSource* _tmp9_; - Alteration* _tmp10_; - gboolean _tmp11_; + SourceHoldingTankCheckToKeep _tmp5_; + void* _tmp5__target; gboolean removed = FALSE; - DataSet* _tmp12_; - DataSource* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; - SourceCollection* _tmp16_; - gboolean _tmp17_; - DataSource* _tmp20_; - SingletonCollection* _tmp21_; - SingletonCollection* _tmp22_; - SourceCollection* _tmp23_; - DataSource* _tmp24_; + DataSet* _tmp6_; + gboolean _tmp7_; + SourceCollection* _tmp8_; + SingletonCollection* _tmp10_; + SingletonCollection* _tmp11_; + SourceCollection* _tmp12_; #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1221,113 +1187,91 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS #line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = self->priv->tank; #line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp1_ = source; -#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (!_tmp2_) { -#line 1230 "SourceHoldingTank.c" - DataSource* _tmp3_; + if (!data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject))) { +#line 1192 "SourceHoldingTank.c" + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp3_ = source; #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp6_ = source_holding_tank_to_string (self); + _tmp3_ = source_holding_tank_to_string (self); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_debug ("SourceHoldingTank.vala:168: SourceHoldingTank.internal_notify_altered " \ -"called for %s not stored in %s", _tmp5_, _tmp7_); +"called for %s not stored in %s", _tmp2_, _tmp4_); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp2_); #line 171 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1254 "SourceHoldingTank.c" +#line 1213 "SourceHoldingTank.c" } #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8_ = self->priv->check_to_keep; -#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp8__target = self->priv->check_to_keep_target; -#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp9_ = source; + _tmp5_ = self->priv->check_to_keep; #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp10_ = alteration; + _tmp5__target = self->priv->check_to_keep_target; #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp11_ = _tmp8_ (_tmp9_, _tmp10_, _tmp8__target); -#line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp11_) { + if (_tmp5_ (source, alteration, _tmp5__target)) { #line 176 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1270 "SourceHoldingTank.c" +#line 1223 "SourceHoldingTank.c" } #line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp12_ = self->priv->tank; -#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp13_ = source; + _tmp6_ = self->priv->tank; #line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp14_ = data_set_remove (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); -#line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - removed = _tmp14_; + removed = data_set_remove (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 179 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp15_ = removed; + _tmp7_ = removed; #line 179 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _vala_assert (_tmp15_, "removed"); -#line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp16_ = self->priv->sources; + _vala_assert (_tmp7_, "removed"); #line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp17_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp8_ = self->priv->sources; #line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - if (_tmp17_) { -#line 1290 "SourceHoldingTank.c" - GeeHashSet* _tmp18_; - DataSource* _tmp19_; + if (data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection))) { +#line 1237 "SourceHoldingTank.c" + GeeHashSet* _tmp9_; #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp18_ = self->priv->relinks; + _tmp9_ = self->priv->relinks; #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp19_ = source; -#line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), source); #line 184 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1301 "SourceHoldingTank.c" +#line 1245 "SourceHoldingTank.c" } #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp20_ = source; -#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp21_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp20_); + _tmp10_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, source); #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp22_ = _tmp21_; + _tmp11_ = _tmp10_; #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _g_object_unref0 (_tmp22_); -#line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp23_ = self->priv->sources; + _g_object_unref0 (_tmp11_); #line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - _tmp24_ = source; + _tmp12_ = self->priv->sources; #line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - source_collection_relink (_tmp23_, _tmp24_); -#line 1319 "SourceHoldingTank.c" + source_collection_relink (_tmp12_, source); +#line 1259 "SourceHoldingTank.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return self ? g_object_ref (self) : NULL; -#line 1326 "SourceHoldingTank.c" +#line 1268 "SourceHoldingTank.c" } -static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) { +static void +source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) +{ GeeHashSet* _tmp0_; gint _tmp1_; gint _tmp2_; @@ -1350,7 +1294,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* if (_tmp2_ == 0) { #line 194 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1353 "SourceHoldingTank.c" +#line 1297 "SourceHoldingTank.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = self->priv->relinks; @@ -1376,11 +1320,13 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* source_collection_relink_many (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (copy); -#line 1379 "SourceHoldingTank.c" +#line 1323 "SourceHoldingTank.c" } -gchar* source_holding_tank_to_string (SourceHoldingTank* self) { +gchar* +source_holding_tank_to_string (SourceHoldingTank* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 205 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1391,20 +1337,31 @@ gchar* source_holding_tank_to_string (SourceHoldingTank* self) { result = _tmp0_; #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 1394 "SourceHoldingTank.c" +#line 1340 "SourceHoldingTank.c" } -static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) { +static void +source_holding_tank_real_contents_altered (SourceHoldingTank* self, + GeeCollection* added, + GeeCollection* removed) +{ #line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 1403 "SourceHoldingTank.c" +#line 1353 "SourceHoldingTank.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; @@ -1419,120 +1376,145 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" data2 = param_values->data[0].v_pointer; -#line 1422 "SourceHoldingTank.c" +#line 1379 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" data1 = param_values->data[0].v_pointer; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" data2 = closure->data; -#line 1428 "SourceHoldingTank.c" +#line 1385 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1434 "SourceHoldingTank.c" +#line 1391 "SourceHoldingTank.c" } -static void value_source_holding_tank_init (GValue* value) { +static void +value_source_holding_tank_init (GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1441 "SourceHoldingTank.c" +#line 1400 "SourceHoldingTank.c" } -static void value_source_holding_tank_free_value (GValue* value) { +static void +value_source_holding_tank_free_value (GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (value->data[0].v_pointer) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_unref (value->data[0].v_pointer); -#line 1450 "SourceHoldingTank.c" +#line 1411 "SourceHoldingTank.c" } } -static void value_source_holding_tank_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_source_holding_tank_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (src_value->data[0].v_pointer) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" dest_value->data[0].v_pointer = source_holding_tank_ref (src_value->data[0].v_pointer); -#line 1460 "SourceHoldingTank.c" +#line 1424 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" dest_value->data[0].v_pointer = NULL; -#line 1464 "SourceHoldingTank.c" +#line 1428 "SourceHoldingTank.c" } } -static gpointer value_source_holding_tank_peek_pointer (const GValue* value) { +static gpointer +value_source_holding_tank_peek_pointer (const GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return value->data[0].v_pointer; -#line 1472 "SourceHoldingTank.c" +#line 1438 "SourceHoldingTank.c" } -static gchar* value_source_holding_tank_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_holding_tank_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (collect_values[0].v_pointer) { -#line 1479 "SourceHoldingTank.c" +#line 1450 "SourceHoldingTank.c" SourceHoldingTank * object; object = collect_values[0].v_pointer; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (object->parent_instance.g_class == NULL) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1486 "SourceHoldingTank.c" +#line 1457 "SourceHoldingTank.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.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 1490 "SourceHoldingTank.c" +#line 1461 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = source_holding_tank_ref (object); -#line 1494 "SourceHoldingTank.c" +#line 1465 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1498 "SourceHoldingTank.c" +#line 1469 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return NULL; -#line 1502 "SourceHoldingTank.c" +#line 1473 "SourceHoldingTank.c" } -static gchar* value_source_holding_tank_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_source_holding_tank_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SourceHoldingTank ** object_p; object_p = collect_values[0].v_pointer; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!object_p) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1513 "SourceHoldingTank.c" +#line 1489 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!value->data[0].v_pointer) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" *object_p = NULL; -#line 1519 "SourceHoldingTank.c" +#line 1495 "SourceHoldingTank.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" *object_p = value->data[0].v_pointer; -#line 1523 "SourceHoldingTank.c" +#line 1499 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" *object_p = source_holding_tank_ref (value->data[0].v_pointer); -#line 1527 "SourceHoldingTank.c" +#line 1503 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return NULL; -#line 1531 "SourceHoldingTank.c" +#line 1507 "SourceHoldingTank.c" } -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSourceHoldingTank* spec; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SOURCE_HOLDING_TANK), NULL); @@ -1542,20 +1524,25 @@ GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return G_PARAM_SPEC (spec); -#line 1545 "SourceHoldingTank.c" +#line 1527 "SourceHoldingTank.c" } -gpointer value_get_source_holding_tank (const GValue* value) { +gpointer +value_get_source_holding_tank (const GValue* value) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK), NULL); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return value->data[0].v_pointer; -#line 1554 "SourceHoldingTank.c" +#line 1538 "SourceHoldingTank.c" } -void value_set_source_holding_tank (GValue* value, gpointer v_object) { +void +value_set_source_holding_tank (GValue* value, + gpointer v_object) +{ SourceHoldingTank * old; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK)); @@ -1571,22 +1558,25 @@ void value_set_source_holding_tank (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_ref (value->data[0].v_pointer); -#line 1574 "SourceHoldingTank.c" +#line 1561 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1578 "SourceHoldingTank.c" +#line 1565 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (old) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_unref (old); -#line 1584 "SourceHoldingTank.c" +#line 1571 "SourceHoldingTank.c" } } -void value_take_source_holding_tank (GValue* value, gpointer v_object) { +void +value_take_source_holding_tank (GValue* value, + gpointer v_object) +{ SourceHoldingTank * old; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK)); @@ -1600,22 +1590,24 @@ void value_take_source_holding_tank (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = v_object; -#line 1603 "SourceHoldingTank.c" +#line 1593 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1607 "SourceHoldingTank.c" +#line 1597 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (old) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_unref (old); -#line 1613 "SourceHoldingTank.c" +#line 1603 "SourceHoldingTank.c" } } -static void source_holding_tank_class_init (SourceHoldingTankClass * klass) { +static void +source_holding_tank_class_init (SourceHoldingTankClass * klass) +{ #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_parent_class = g_type_class_peek_parent (klass); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1628,11 +1620,13 @@ static void source_holding_tank_class_init (SourceHoldingTankClass * klass) { ((SourceHoldingTankClass *) klass)->contents_altered = source_holding_tank_real_contents_altered; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_SOURCE_HOLDING_TANK, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceHoldingTankClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); -#line 1631 "SourceHoldingTank.c" +#line 1623 "SourceHoldingTank.c" } -static void source_holding_tank_instance_init (SourceHoldingTank * self) { +static void +source_holding_tank_instance_init (SourceHoldingTank * self) +{ DataSet* _tmp0_; GeeHashSet* _tmp1_; GeeHashSet* _tmp2_; @@ -1654,11 +1648,13 @@ static void source_holding_tank_instance_init (SourceHoldingTank * self) { self->priv->ordinal = (gint64) 0; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" self->ref_count = 1; -#line 1657 "SourceHoldingTank.c" +#line 1651 "SourceHoldingTank.c" } -static void source_holding_tank_finalize (SourceHoldingTank * obj) { +static void +source_holding_tank_finalize (SourceHoldingTank * obj) +{ SourceHoldingTank * self; SourceCollection* _tmp0_; guint _tmp1_; @@ -1688,11 +1684,13 @@ static void source_holding_tank_finalize (SourceHoldingTank * obj) { _g_object_unref0 (self->priv->relinks); #line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (self->priv->unlinking); -#line 1691 "SourceHoldingTank.c" +#line 1687 "SourceHoldingTank.c" } -GType source_holding_tank_get_type (void) { +GType +source_holding_tank_get_type (void) +{ static volatile gsize source_holding_tank_type_id__volatile = 0; if (g_once_init_enter (&source_holding_tank_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_source_holding_tank_init, value_source_holding_tank_free_value, value_source_holding_tank_copy_value, value_source_holding_tank_peek_pointer, "p", value_source_holding_tank_collect_value, "p", value_source_holding_tank_lcopy_value }; @@ -1706,7 +1704,9 @@ GType source_holding_tank_get_type (void) { } -gpointer source_holding_tank_ref (gpointer instance) { +gpointer +source_holding_tank_ref (gpointer instance) +{ SourceHoldingTank * self; self = instance; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1717,7 +1717,9 @@ gpointer source_holding_tank_ref (gpointer instance) { } -void source_holding_tank_unref (gpointer instance) { +void +source_holding_tank_unref (gpointer instance) +{ SourceHoldingTank * self; self = instance; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1726,7 +1728,7 @@ void source_holding_tank_unref (gpointer instance) { SOURCE_HOLDING_TANK_GET_CLASS (self)->finalize (self); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1729 "SourceHoldingTank.c" +#line 1731 "SourceHoldingTank.c" } } diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c index cc43f4e..a68996d 100644 --- a/src/core/SourceInterfaces.c +++ b/src/core/SourceInterfaces.c @@ -1,4 +1,4 @@ -/* SourceInterfaces.c generated by valac 0.36.6, the Vala compiler +/* SourceInterfaces.c generated by valac 0.40.4, the Vala compiler * generated from SourceInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -16,6 +16,7 @@ /* When the indexable string has changed, the object should fire an alteration of*/ /* "indexable:keywords". The prepare methods will not do this.*/ + #include #include #include @@ -66,91 +67,77 @@ const gchar* indexable_get_indexable_keywords (Indexable* self); gchar* indexable_prepare_indexable_string (const gchar* str); gboolean is_string_empty (const gchar* s); gchar* string_remove_diacritics (const gchar* istring); -gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1); +gchar* indexable_prepare_indexable_strings (gchar** strs, + int strs_length1); -const gchar* indexable_get_indexable_keywords (Indexable* self) { +const gchar* +indexable_get_indexable_keywords (Indexable* self) +{ #line 19 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" g_return_val_if_fail (IS_INDEXABLE (self), NULL); #line 19 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return INDEXABLE_GET_INTERFACE (self)->get_indexable_keywords (self); -#line 78 "SourceInterfaces.c" +#line 82 "SourceInterfaces.c" } -gchar* indexable_prepare_indexable_string (const gchar* str) { +gchar* +indexable_prepare_indexable_string (const gchar* str) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; -#line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp0_ = str; -#line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp1_ = is_string_empty (_tmp0_); #line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (_tmp1_) { + if (is_string_empty (str)) { #line 23 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" result = NULL; #line 23 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 101 "SourceInterfaces.c" +#line 100 "SourceInterfaces.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp2_ = str; + _tmp0_ = g_utf8_strdown (str, (gssize) -1); #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp3_ = g_utf8_strdown (_tmp2_, (gssize) -1); + _tmp1_ = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp4_ = _tmp3_; + _tmp2_ = string_remove_diacritics (_tmp1_); #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp5_ = string_remove_diacritics (_tmp4_); + _tmp3_ = _tmp2_; #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp6_ = _tmp5_; + _g_free0 (_tmp1_); #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _g_free0 (_tmp4_); -#line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - result = _tmp6_; + result = _tmp3_; #line 24 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 119 "SourceInterfaces.c" +#line 116 "SourceInterfaces.c" } -gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { +gchar* +indexable_prepare_indexable_strings (gchar** strs, + int strs_length1) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; - gchar** _tmp1_; - gint _tmp1__length1; GString* builder = NULL; - GString* _tmp3_; + GString* _tmp1_; gint ctr = 0; - const gchar* _tmp21_ = NULL; - GString* _tmp22_; - const gchar* _tmp23_; - gboolean _tmp24_; - gchar* _tmp27_; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp1_ = strs; + const gchar* _tmp14_ = NULL; + GString* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp19_; #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp1__length1 = strs_length1; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (_tmp1_ == NULL) { + if (strs == NULL) { #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" _tmp0_ = TRUE; -#line 144 "SourceInterfaces.c" +#line 137 "SourceInterfaces.c" } else { - gchar** _tmp2_; - gint _tmp2__length1; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp2_ = strs; -#line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp2__length1 = strs_length1; #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp0_ = _tmp2__length1 == 0; -#line 154 "SourceInterfaces.c" + _tmp0_ = strs_length1 == 0; +#line 141 "SourceInterfaces.c" } #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (_tmp0_) { @@ -158,161 +145,136 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { result = NULL; #line 29 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 162 "SourceInterfaces.c" +#line 149 "SourceInterfaces.c" } #line 31 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp3_ = g_string_new (""); + _tmp1_ = g_string_new (""); #line 31 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - builder = _tmp3_; + builder = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" ctr = 0; -#line 170 "SourceInterfaces.c" +#line 157 "SourceInterfaces.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp2_ = FALSE; #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp4_ = TRUE; + _tmp2_ = TRUE; #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" while (TRUE) { -#line 177 "SourceInterfaces.c" - gchar** _tmp8_; - gint _tmp8__length1; - gint _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; +#line 164 "SourceInterfaces.c" + gint _tmp5_; + const gchar* _tmp6_; #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!_tmp4_) { -#line 185 "SourceInterfaces.c" - gint _tmp5_; - gint _tmp6_; - gchar** _tmp7_; - gint _tmp7__length1; -#line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp5_ = ctr; -#line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - ctr = _tmp5_ + 1; + if (!_tmp2_) { +#line 169 "SourceInterfaces.c" + gint _tmp3_; + gint _tmp4_; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp6_ = ctr; + _tmp3_ = ctr; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp7_ = strs; + ctr = _tmp3_ + 1; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp7__length1 = strs_length1; + _tmp4_ = ctr; #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!(_tmp6_ < _tmp7__length1)) { + if (!(_tmp4_ < strs_length1)) { #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" break; -#line 204 "SourceInterfaces.c" +#line 182 "SourceInterfaces.c" } } #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp4_ = FALSE; + _tmp2_ = FALSE; #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp8_ = strs; + _tmp5_ = ctr; #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp8__length1 = strs_length1; + _tmp6_ = strs[_tmp5_]; #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp9_ = ctr; -#line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp10_ = _tmp8_[_tmp9_]; -#line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp11_ = is_string_empty (_tmp10_); -#line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!_tmp11_) { -#line 221 "SourceInterfaces.c" - GString* _tmp12_; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gint _tmp18_; - gchar** _tmp19_; - gint _tmp19__length1; -#line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp12_ = builder; -#line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp13_ = strs; + if (!is_string_empty (_tmp6_)) { +#line 193 "SourceInterfaces.c" + GString* _tmp7_; + gint _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gint _tmp12_; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp13__length1 = strs_length1; + _tmp7_ = builder; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp14_ = ctr; + _tmp8_ = ctr; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp15_ = _tmp13_[_tmp14_]; + _tmp9_ = strs[_tmp8_]; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp16_ = g_utf8_strdown (_tmp15_, (gssize) -1); + _tmp10_ = g_utf8_strdown (_tmp9_, (gssize) -1); #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - g_string_append (_tmp12_, _tmp17_); + g_string_append (_tmp7_, _tmp11_); #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _g_free0 (_tmp17_); + _g_free0 (_tmp11_); #line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp18_ = ctr; + _tmp12_ = ctr; #line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp19_ = strs; -#line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp19__length1 = strs_length1; -#line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (_tmp18_ < (_tmp19__length1 - 1)) { -#line 258 "SourceInterfaces.c" - GString* _tmp20_; + if (_tmp12_ < (strs_length1 - 1)) { +#line 218 "SourceInterfaces.c" + GString* _tmp13_; #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp20_ = builder; + _tmp13_ = builder; #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - g_string_append_c (_tmp20_, ' '); -#line 264 "SourceInterfaces.c" + g_string_append_c (_tmp13_, ' '); +#line 224 "SourceInterfaces.c" } } } } #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp22_ = builder; + _tmp15_ = builder; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp23_ = _tmp22_->str; + _tmp16_ = _tmp15_->str; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp24_ = is_string_empty (_tmp23_); + if (!is_string_empty (_tmp16_)) { +#line 235 "SourceInterfaces.c" + GString* _tmp17_; + const gchar* _tmp18_; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - if (!_tmp24_) { -#line 277 "SourceInterfaces.c" - GString* _tmp25_; - const gchar* _tmp26_; + _tmp17_ = builder; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp25_ = builder; + _tmp18_ = _tmp17_->str; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp26_ = _tmp25_->str; -#line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp21_ = _tmp26_; -#line 286 "SourceInterfaces.c" + _tmp14_ = _tmp18_; +#line 244 "SourceInterfaces.c" } else { #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp21_ = NULL; -#line 290 "SourceInterfaces.c" + _tmp14_ = NULL; +#line 248 "SourceInterfaces.c" } #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - _tmp27_ = g_strdup (_tmp21_); + _tmp19_ = g_strdup (_tmp14_); #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" - result = _tmp27_; + result = _tmp19_; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" _g_string_free0 (builder); #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" return result; -#line 300 "SourceInterfaces.c" +#line 258 "SourceInterfaces.c" } -static void indexable_base_init (IndexableIface * iface) { +static void +indexable_base_init (IndexableIface * iface) +{ #line 18 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" static gboolean initialized = FALSE; #line 18 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (!initialized) { #line 18 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" initialized = TRUE; -#line 311 "SourceInterfaces.c" +#line 271 "SourceInterfaces.c" } } -GType indexable_get_type (void) { +GType +indexable_get_type (void) +{ static volatile gsize indexable_type_id__volatile = 0; if (g_once_init_enter (&indexable_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (IndexableIface), (GBaseInitFunc) indexable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; diff --git a/src/core/Tracker.c b/src/core/Tracker.c index ff1dc00..3e3aee8 100644 --- a/src/core/Tracker.c +++ b/src/core/Tracker.c @@ -1,4 +1,4 @@ -/* Tracker.c generated by valac 0.36.6, the Vala compiler +/* Tracker.c generated by valac 0.40.4, the Vala compiler * generated from Tracker.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -67,9 +68,9 @@ typedef struct _DataCollectionClass DataCollectionClass; typedef struct _CoreParamSpecTracker CoreParamSpecTracker; enum { CORE_TRACKER_UPDATED_SIGNAL, - CORE_TRACKER_LAST_SIGNAL + CORE_TRACKER_NUM_SIGNALS }; -static guint core_tracker_signals[CORE_TRACKER_LAST_SIGNAL] = {0}; +static guint core_tracker_signals[CORE_TRACKER_NUM_SIGNALS] = {0}; #define CORE_TYPE_VIEW_TRACKER (core_view_tracker_get_type ()) #define CORE_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTracker)) @@ -112,6 +113,11 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _DataView DataView; typedef struct _DataViewClass DataViewClass; typedef struct _CoreViewTrackerMuxPrivate CoreViewTrackerMuxPrivate; +enum { + CORE_VIEW_TRACKER_MUX_0_PROPERTY, + CORE_VIEW_TRACKER_MUX_NUM_PROPERTIES +}; +static GParamSpec* core_view_tracker_mux_properties[CORE_VIEW_TRACKER_MUX_NUM_PROPERTIES]; #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; } @@ -181,123 +187,193 @@ static CoreTrackerAccumulatorIface * core_view_tracker_mux_core_tracker_accumula 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 core_tracker_accumulator_get_type (void) G_GNUC_CONST; -gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObject* object); -gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, DataObject* object); -gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, DataObject* object, Alteration* alteration); +gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, + DataObject* object); +gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, + DataObject* object); +gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, + DataObject* object, + Alteration* alteration); gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; #define CORE_TRACKER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CORE_TYPE_TRACKER, CoreTrackerPrivate)) -enum { - CORE_TRACKER_DUMMY_PROPERTY -}; -static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added); -static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* removed); -static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map); -static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -CoreTracker* core_tracker_new (DataCollection* collection, GeeCollection* initial); -CoreTracker* core_tracker_construct (GType object_type, DataCollection* collection, GeeCollection* initial); -void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc); +static void core_tracker_on_items_added (CoreTracker* self, + GeeIterable* added); +static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void core_tracker_on_items_removed (CoreTracker* self, + GeeIterable* removed); +static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void core_tracker_on_items_altered (CoreTracker* self, + GeeMap* map); +static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +CoreTracker* core_tracker_new (DataCollection* collection, + GeeCollection* initial); +CoreTracker* core_tracker_construct (GType object_type, + DataCollection* collection, + GeeCollection* initial); +void core_tracker_start (CoreTracker* self, + CoreTrackerAccumulator* acc); GeeCollection* data_collection_get_all (DataCollection* self); DataCollection* core_tracker_get_collection (CoreTracker* self); -void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, CoreTrackerIncludeUnincludeObject cb, void* cb_target); -static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, gpointer self); -static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, gpointer self); +void core_tracker_include_uninclude (CoreTracker* self, + GeeIterable* objects, + CoreTrackerIncludeUnincludeObject cb, + void* cb_target); +static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, + gpointer self); +static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, + gpointer self); static void core_tracker_real_updated (CoreTracker* self); static void core_tracker_finalize (CoreTracker * obj); GType core_view_tracker_get_type (void) G_GNUC_CONST; static GType core_view_tracker_mux_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define CORE_VIEW_TRACKER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerPrivate)) -enum { - CORE_VIEW_TRACKER_DUMMY_PROPERTY -}; GType view_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; -static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollection* shown); -static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, GeeCollection* visible, gpointer self); -static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollection* hidden); -static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self); -static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeIterable* selected); -static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self); -static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIterable* unselected); -static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self); +static void core_view_tracker_on_items_shown (CoreViewTracker* self, + GeeCollection* shown); +static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, + GeeCollection* visible, + gpointer self); +static void core_view_tracker_on_items_hidden (CoreViewTracker* self, + GeeCollection* hidden); +static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, + GeeCollection* hidden, + gpointer self); +static void core_view_tracker_on_items_selected (CoreViewTracker* self, + GeeIterable* selected); +static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self); +static void core_view_tracker_on_items_unselected (CoreViewTracker* self, + GeeIterable* unselected); +static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, + GeeIterable* unselected, + gpointer self); CoreViewTracker* core_view_tracker_new (ViewCollection* collection); -CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection); +CoreViewTracker* core_view_tracker_construct (GType object_type, + ViewCollection* collection); GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self); -void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); -static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); -static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected); -enum { - CORE_VIEW_TRACKER_MUX_DUMMY_PROPERTY -}; -static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, DataObject* object); +void core_view_tracker_start (CoreViewTracker* self, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); +static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); +static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected); +static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, + DataObject* object); gboolean data_view_is_visible (DataView* self); gboolean data_view_is_selected (DataView* self); -static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, DataObject* object); -static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration); +static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object); +static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration); static void core_view_tracker_mux_finalize (GObject * obj); static void core_view_tracker_finalize (CoreTracker * obj); -gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObject* object) { +gboolean +core_tracker_accumulator_include (CoreTrackerAccumulator* self, + DataObject* object) +{ #line 13 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE); #line 13 "/home/jens/Source/shotwell/src/core/Tracker.vala" return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->include (self, object); -#line 267 "Tracker.c" +#line 332 "Tracker.c" } -gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, DataObject* object) { +gboolean +core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, + DataObject* object) +{ #line 15 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE); #line 15 "/home/jens/Source/shotwell/src/core/Tracker.vala" return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->uninclude (self, object); -#line 276 "Tracker.c" +#line 344 "Tracker.c" } -gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, DataObject* object, Alteration* alteration) { +gboolean +core_tracker_accumulator_altered (CoreTrackerAccumulator* self, + DataObject* object, + Alteration* alteration) +{ #line 17 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE); #line 17 "/home/jens/Source/shotwell/src/core/Tracker.vala" return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->altered (self, object, alteration); -#line 285 "Tracker.c" +#line 357 "Tracker.c" } -static void core_tracker_accumulator_base_init (CoreTrackerAccumulatorIface * iface) { +static void +core_tracker_accumulator_base_init (CoreTrackerAccumulatorIface * iface) +{ #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala" static gboolean initialized = FALSE; #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (!initialized) { #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala" initialized = TRUE; -#line 296 "Tracker.c" +#line 370 "Tracker.c" } } -GType core_tracker_accumulator_get_type (void) { +GType +core_tracker_accumulator_get_type (void) +{ static volatile gsize core_tracker_accumulator_type_id__volatile = 0; if (g_once_init_enter (&core_tracker_accumulator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CoreTrackerAccumulatorIface), (GBaseInitFunc) core_tracker_accumulator_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -310,47 +386,65 @@ GType core_tracker_accumulator_get_type (void) { } -static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_on_items_added ((CoreTracker*) self, added); -#line 317 "Tracker.c" +#line 397 "Tracker.c" } -static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_on_items_removed ((CoreTracker*) self, removed); -#line 324 "Tracker.c" +#line 408 "Tracker.c" } -static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_on_items_altered ((CoreTracker*) self, items); -#line 331 "Tracker.c" +#line 419 "Tracker.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self ? data_collection_ref (self) : NULL; -#line 338 "Tracker.c" +#line 428 "Tracker.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self ? g_object_ref (self) : NULL; -#line 345 "Tracker.c" +#line 437 "Tracker.c" } -CoreTracker* core_tracker_construct (GType object_type, DataCollection* collection, GeeCollection* initial) { +CoreTracker* +core_tracker_construct (GType object_type, + DataCollection* collection, + GeeCollection* initial) +{ CoreTracker* self = NULL; DataCollection* _tmp0_; - DataCollection* _tmp1_; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeCollection* _tmp1_; #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_DATA_COLLECTION (collection), NULL); #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -358,43 +452,44 @@ CoreTracker* core_tracker_construct (GType object_type, DataCollection* collecti #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = (CoreTracker*) g_type_create_instance (object_type); #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = collection; -#line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (collection); #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (self->priv->collection); #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->collection = _tmp1_; -#line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = initial; + self->priv->collection = _tmp0_; #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (initial); #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->initial); #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->initial = _tmp3_; + self->priv->initial = _tmp1_; #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 379 "Tracker.c" +#line 469 "Tracker.c" } -CoreTracker* core_tracker_new (DataCollection* collection, GeeCollection* initial) { +CoreTracker* +core_tracker_new (DataCollection* collection, + GeeCollection* initial) +{ #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" return core_tracker_construct (CORE_TYPE_TRACKER, collection, initial); -#line 386 "Tracker.c" +#line 479 "Tracker.c" } -void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { +void +core_tracker_start (CoreTracker* self, + CoreTrackerAccumulator* acc) +{ CoreTrackerAccumulator* _tmp0_; CoreTrackerAccumulator* _tmp1_; - CoreTrackerAccumulator* _tmp2_; + DataCollection* _tmp2_; DataCollection* _tmp3_; DataCollection* _tmp4_; - DataCollection* _tmp5_; - gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_; + gboolean _tmp5_ = FALSE; + GeeCollection* _tmp6_; #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -404,88 +499,88 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { #line 48 "/home/jens/Source/shotwell/src/core/Tracker.vala" _vala_assert (_tmp0_ == NULL, "this.acc == null"); #line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = acc; -#line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (acc); #line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->acc); #line 50 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->acc = _tmp2_; + self->priv->acc = _tmp1_; #line 52 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->collection; + _tmp2_ = self->priv->collection; #line 52 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_connect (_tmp3_, "items-added", (GCallback) _core_tracker_on_items_added_data_collection_items_added, self); + g_signal_connect (_tmp2_, "items-added", (GCallback) _core_tracker_on_items_added_data_collection_items_added, self); #line 53 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->priv->collection; + _tmp3_ = self->priv->collection; #line 53 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_connect (_tmp4_, "items-removed", (GCallback) _core_tracker_on_items_removed_data_collection_items_removed, self); + g_signal_connect (_tmp3_, "items-removed", (GCallback) _core_tracker_on_items_removed_data_collection_items_removed, self); #line 54 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = self->priv->collection; + _tmp4_ = self->priv->collection; #line 54 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_connect (_tmp5_, "items-altered", (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self); + g_signal_connect (_tmp4_, "items-altered", (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self); #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = self->priv->initial; + _tmp6_ = self->priv->initial; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp7_ != NULL) { -#line 431 "Tracker.c" - GeeCollection* _tmp8_; + if (_tmp6_ != NULL) { +#line 524 "Tracker.c" + GeeCollection* _tmp7_; + gint _tmp8_; gint _tmp9_; - gint _tmp10_; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = self->priv->initial; + _tmp7_ = self->priv->initial; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = gee_collection_get_size (_tmp8_); + _tmp8_ = gee_collection_get_size (_tmp7_); #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = _tmp10_ > 0; -#line 443 "Tracker.c" + _tmp5_ = _tmp9_ > 0; +#line 536 "Tracker.c" } else { #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = FALSE; -#line 447 "Tracker.c" + _tmp5_ = FALSE; +#line 540 "Tracker.c" } #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_) { -#line 451 "Tracker.c" - GeeCollection* _tmp11_; + if (_tmp5_) { +#line 544 "Tracker.c" + GeeCollection* _tmp10_; #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = self->priv->initial; + _tmp10_ = self->priv->initial; #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 457 "Tracker.c" + core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 550 "Tracker.c" } else { - GeeCollection* _tmp12_; + GeeCollection* _tmp11_; #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = self->priv->initial; + _tmp11_ = self->priv->initial; #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp12_ == NULL) { -#line 464 "Tracker.c" - DataCollection* _tmp13_; + if (_tmp11_ == NULL) { +#line 557 "Tracker.c" + DataCollection* _tmp12_; + GeeCollection* _tmp13_; GeeCollection* _tmp14_; - GeeCollection* _tmp15_; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = self->priv->collection; + _tmp12_ = self->priv->collection; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = data_collection_get_all (_tmp13_); + _tmp13_ = data_collection_get_all (_tmp12_); #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); + core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _g_object_unref0 (_tmp15_); -#line 478 "Tracker.c" + _g_object_unref0 (_tmp14_); +#line 571 "Tracker.c" } } #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->initial); #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv->initial = NULL; -#line 485 "Tracker.c" +#line 578 "Tracker.c" } -DataCollection* core_tracker_get_collection (CoreTracker* self) { +DataCollection* +core_tracker_get_collection (CoreTracker* self) +{ DataCollection* result = NULL; DataCollection* _tmp0_; DataCollection* _tmp1_; @@ -499,374 +594,388 @@ DataCollection* core_tracker_get_collection (CoreTracker* self) { result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 503 "Tracker.c" +#line 598 "Tracker.c" } -static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, gpointer self) { +static gboolean +_core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, + gpointer self) +{ gboolean result; result = core_tracker_accumulator_include ((CoreTrackerAccumulator*) self, object); #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 512 "Tracker.c" +#line 610 "Tracker.c" } -static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added) { - GeeIterable* _tmp0_; - CoreTrackerAccumulator* _tmp1_; +static void +core_tracker_on_items_added (CoreTracker* self, + GeeIterable* added) +{ + CoreTrackerAccumulator* _tmp0_; #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = added; -#line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = self->priv->acc; + _tmp0_ = self->priv->acc; #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp1_); -#line 529 "Tracker.c" + core_tracker_include_uninclude (self, added, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp0_); +#line 627 "Tracker.c" } -static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, gpointer self) { +static gboolean +_core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, + gpointer self) +{ gboolean result; result = core_tracker_accumulator_uninclude ((CoreTrackerAccumulator*) self, object); #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 538 "Tracker.c" +#line 639 "Tracker.c" } -static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* removed) { - GeeIterable* _tmp0_; - CoreTrackerAccumulator* _tmp1_; +static void +core_tracker_on_items_removed (CoreTracker* self, + GeeIterable* removed) +{ + CoreTrackerAccumulator* _tmp0_; #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = removed; -#line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = self->priv->acc; + _tmp0_ = self->priv->acc; #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp1_); -#line 555 "Tracker.c" + core_tracker_include_uninclude (self, removed, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp0_); +#line 656 "Tracker.c" } -void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, CoreTrackerIncludeUnincludeObject cb, void* cb_target) { +void +core_tracker_include_uninclude (CoreTracker* self, + GeeIterable* objects, + CoreTrackerIncludeUnincludeObject cb, + void* cb_target) +{ gboolean fire_updated = FALSE; - gboolean _tmp11_; + gboolean _tmp7_; #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_ITERABLE (objects)); #line 78 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; -#line 568 "Tracker.c" +#line 674 "Tracker.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = objects; + GeeIterator* _tmp0_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (objects); #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" while (TRUE) { -#line 581 "Tracker.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 684 "Tracker.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - gboolean _tmp6_ = FALSE; - CoreTrackerIncludeUnincludeObject _tmp7_; - void* _tmp7__target; - DataObject* _tmp8_; - gboolean _tmp9_; -#line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + gboolean _tmp4_ = FALSE; + DataObject* _tmp5_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" break; -#line 600 "Tracker.c" +#line 697 "Tracker.c" } #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" - object = (DataObject*) _tmp5_; -#line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = cb; -#line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7__target = cb_target; + object = (DataObject*) _tmp3_; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = object; + _tmp5_ = object; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = _tmp7_ (_tmp8_, _tmp7__target); + if (cb (_tmp5_, cb_target)) { #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_) { -#line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = TRUE; -#line 620 "Tracker.c" + _tmp4_ = TRUE; +#line 711 "Tracker.c" } else { - gboolean _tmp10_; + gboolean _tmp6_; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = fire_updated; + _tmp6_ = fire_updated; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = _tmp10_; -#line 627 "Tracker.c" + _tmp4_ = _tmp6_; +#line 718 "Tracker.c" } #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp6_; + fire_updated = _tmp4_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (object); -#line 633 "Tracker.c" +#line 724 "Tracker.c" } #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (_object_it); -#line 637 "Tracker.c" +#line 728 "Tracker.c" } #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = fire_updated; + _tmp7_ = fire_updated; #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp11_) { + if (_tmp7_) { #line 83 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0); -#line 645 "Tracker.c" +#line 736 "Tracker.c" } } -static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) { +static void +core_tracker_on_items_altered (CoreTracker* self, + GeeMap* map) +{ gboolean fire_updated = FALSE; - gboolean _tmp20_; + gboolean _tmp16_; #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_TRACKER (self)); #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 87 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; -#line 659 "Tracker.c" +#line 753 "Tracker.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp2_ = _tmp1_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp2_; -#line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" while (TRUE) { -#line 686 "Tracker.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 777 "Tracker.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - gboolean _tmp10_ = FALSE; - CoreTrackerAccumulator* _tmp11_; - DataObject* _tmp12_; - GeeMap* _tmp13_; - DataObject* _tmp14_; - gpointer _tmp15_; - Alteration* _tmp16_; - gboolean _tmp17_; - gboolean _tmp18_; -#line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = _object_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + gboolean _tmp8_ = FALSE; + CoreTrackerAccumulator* _tmp9_; + DataObject* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; + Alteration* _tmp13_; + gboolean _tmp14_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" break; -#line 709 "Tracker.c" +#line 795 "Tracker.c" } #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" - object = (DataObject*) _tmp9_; -#line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = self->priv->acc; + object = (DataObject*) _tmp7_; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = object; + _tmp9_ = self->priv->acc; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = map; + _tmp10_ = object; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = object; + _tmp11_ = object; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = gee_map_get (_tmp13_, _tmp14_); + _tmp12_ = gee_map_get (map, _tmp11_); #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = (Alteration*) _tmp15_; + _tmp13_ = (Alteration*) _tmp12_; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = core_tracker_accumulator_altered (_tmp11_, _tmp12_, _tmp16_); + _tmp14_ = core_tracker_accumulator_altered (_tmp9_, _tmp10_, _tmp13_); #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = _tmp17_; + _alteration_unref0 (_tmp13_); #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _alteration_unref0 (_tmp16_); + if (_tmp14_) { #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp18_) { -#line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = TRUE; -#line 739 "Tracker.c" + _tmp8_ = TRUE; +#line 821 "Tracker.c" } else { - gboolean _tmp19_; + gboolean _tmp15_; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = fire_updated; + _tmp15_ = fire_updated; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = _tmp19_; -#line 746 "Tracker.c" + _tmp8_ = _tmp15_; +#line 828 "Tracker.c" } #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp10_; + fire_updated = _tmp8_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (object); -#line 752 "Tracker.c" +#line 834 "Tracker.c" } #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (_object_it); -#line 756 "Tracker.c" +#line 838 "Tracker.c" } #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = fire_updated; + _tmp16_ = fire_updated; #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp20_) { + if (_tmp16_) { #line 92 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0); -#line 764 "Tracker.c" +#line 846 "Tracker.c" } } -static void core_tracker_real_updated (CoreTracker* self) { +static void +core_tracker_real_updated (CoreTracker* self) +{ } -static void core_value_tracker_init (GValue* value) { +static void +core_value_tracker_init (GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 776 "Tracker.c" +#line 862 "Tracker.c" } -static void core_value_tracker_free_value (GValue* value) { +static void +core_value_tracker_free_value (GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_unref (value->data[0].v_pointer); -#line 785 "Tracker.c" +#line 873 "Tracker.c" } } -static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest_value) { +static void +core_value_tracker_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (src_value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" dest_value->data[0].v_pointer = core_tracker_ref (src_value->data[0].v_pointer); -#line 795 "Tracker.c" +#line 886 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" dest_value->data[0].v_pointer = NULL; -#line 799 "Tracker.c" +#line 890 "Tracker.c" } } -static gpointer core_value_tracker_peek_pointer (const GValue* value) { +static gpointer +core_value_tracker_peek_pointer (const GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return value->data[0].v_pointer; -#line 807 "Tracker.c" +#line 900 "Tracker.c" } -static gchar* core_value_tracker_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +core_value_tracker_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (collect_values[0].v_pointer) { -#line 814 "Tracker.c" +#line 912 "Tracker.c" CoreTracker * object; object = collect_values[0].v_pointer; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (object->parent_instance.g_class == NULL) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 821 "Tracker.c" +#line 919 "Tracker.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.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 825 "Tracker.c" +#line 923 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = core_tracker_ref (object); -#line 829 "Tracker.c" +#line 927 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 833 "Tracker.c" +#line 931 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return NULL; -#line 837 "Tracker.c" +#line 935 "Tracker.c" } -static gchar* core_value_tracker_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +core_value_tracker_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CoreTracker ** object_p; object_p = collect_values[0].v_pointer; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (!object_p) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 848 "Tracker.c" +#line 951 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (!value->data[0].v_pointer) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" *object_p = NULL; -#line 854 "Tracker.c" +#line 957 "Tracker.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" *object_p = value->data[0].v_pointer; -#line 858 "Tracker.c" +#line 961 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" *object_p = core_tracker_ref (value->data[0].v_pointer); -#line 862 "Tracker.c" +#line 965 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return NULL; -#line 866 "Tracker.c" +#line 969 "Tracker.c" } -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ CoreParamSpecTracker* spec; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (g_type_is_a (object_type, CORE_TYPE_TRACKER), NULL); @@ -876,20 +985,25 @@ GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return G_PARAM_SPEC (spec); -#line 880 "Tracker.c" +#line 989 "Tracker.c" } -gpointer core_value_get_tracker (const GValue* value) { +gpointer +core_value_get_tracker (const GValue* value) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER), NULL); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return value->data[0].v_pointer; -#line 889 "Tracker.c" +#line 1000 "Tracker.c" } -void core_value_set_tracker (GValue* value, gpointer v_object) { +void +core_value_set_tracker (GValue* value, + gpointer v_object) +{ CoreTracker * old; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER)); @@ -905,22 +1019,25 @@ void core_value_set_tracker (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_ref (value->data[0].v_pointer); -#line 909 "Tracker.c" +#line 1023 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 913 "Tracker.c" +#line 1027 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (old) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_unref (old); -#line 919 "Tracker.c" +#line 1033 "Tracker.c" } } -void core_value_take_tracker (GValue* value, gpointer v_object) { +void +core_value_take_tracker (GValue* value, + gpointer v_object) +{ CoreTracker * old; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER)); @@ -934,22 +1051,24 @@ void core_value_take_tracker (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = v_object; -#line 938 "Tracker.c" +#line 1055 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 942 "Tracker.c" +#line 1059 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (old) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_unref (old); -#line 948 "Tracker.c" +#line 1065 "Tracker.c" } } -static void core_tracker_class_init (CoreTrackerClass * klass) { +static void +core_tracker_class_init (CoreTrackerClass * klass) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_parent_class = g_type_class_peek_parent (klass); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -960,22 +1079,26 @@ static void core_tracker_class_init (CoreTrackerClass * klass) { ((CoreTrackerClass *) klass)->updated = core_tracker_real_updated; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL] = g_signal_new ("updated", CORE_TYPE_TRACKER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CoreTrackerClass, updated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 964 "Tracker.c" +#line 1083 "Tracker.c" } -static void core_tracker_instance_init (CoreTracker * self) { +static void +core_tracker_instance_init (CoreTracker * self) +{ #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv = CORE_TRACKER_GET_PRIVATE (self); #line 28 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv->acc = NULL; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->ref_count = 1; -#line 975 "Tracker.c" +#line 1096 "Tracker.c" } -static void core_tracker_finalize (CoreTracker * obj) { +static void +core_tracker_finalize (CoreTracker * obj) +{ CoreTracker * self; CoreTrackerAccumulator* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -986,7 +1109,7 @@ static void core_tracker_finalize (CoreTracker * obj) { _tmp0_ = self->priv->acc; #line 39 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp0_ != NULL) { -#line 990 "Tracker.c" +#line 1113 "Tracker.c" DataCollection* _tmp1_; guint _tmp2_; DataCollection* _tmp3_; @@ -1011,7 +1134,7 @@ static void core_tracker_finalize (CoreTracker * obj) { g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE); #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self); -#line 1015 "Tracker.c" +#line 1138 "Tracker.c" } #line 26 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (self->priv->collection); @@ -1019,11 +1142,13 @@ static void core_tracker_finalize (CoreTracker * obj) { _g_object_unref0 (self->priv->initial); #line 28 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->acc); -#line 1023 "Tracker.c" +#line 1146 "Tracker.c" } -GType core_tracker_get_type (void) { +GType +core_tracker_get_type (void) +{ static volatile gsize core_tracker_type_id__volatile = 0; if (g_once_init_enter (&core_tracker_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { core_value_tracker_init, core_value_tracker_free_value, core_value_tracker_copy_value, core_value_tracker_peek_pointer, "p", core_value_tracker_collect_value, "p", core_value_tracker_lcopy_value }; @@ -1037,18 +1162,22 @@ GType core_tracker_get_type (void) { } -gpointer core_tracker_ref (gpointer instance) { +gpointer +core_tracker_ref (gpointer instance) +{ CoreTracker * self; self = instance; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_atomic_int_inc (&self->ref_count); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return instance; -#line 1048 "Tracker.c" +#line 1175 "Tracker.c" } -void core_tracker_unref (gpointer instance) { +void +core_tracker_unref (gpointer instance) +{ CoreTracker * self; self = instance; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1057,82 +1186,99 @@ void core_tracker_unref (gpointer instance) { CORE_TRACKER_GET_CLASS (self)->finalize (self); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1061 "Tracker.c" +#line 1190 "Tracker.c" } } -static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, GeeCollection* visible, gpointer self) { +static void +_core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, + GeeCollection* visible, + gpointer self) +{ #line 173 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_shown ((CoreViewTracker*) self, visible); -#line 1069 "Tracker.c" +#line 1202 "Tracker.c" } -static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) { +static void +_core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, + GeeCollection* hidden, + gpointer self) +{ #line 174 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_hidden ((CoreViewTracker*) self, hidden); -#line 1076 "Tracker.c" +#line 1213 "Tracker.c" } -static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) { +static void +_core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, + GeeIterable* selected, + gpointer self) +{ #line 175 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_selected ((CoreViewTracker*) self, selected); -#line 1083 "Tracker.c" +#line 1224 "Tracker.c" } -static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self) { +static void +_core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, + GeeIterable* unselected, + gpointer self) +{ #line 176 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_on_items_unselected ((CoreViewTracker*) self, unselected); -#line 1090 "Tracker.c" +#line 1235 "Tracker.c" } -CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection) { +CoreViewTracker* +core_view_tracker_construct (GType object_type, + ViewCollection* collection) +{ CoreViewTracker* self = NULL; - ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL); #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = collection; -#line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = collection; -#line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = view_collection_get_all_unfiltered (_tmp1_); + _tmp0_ = view_collection_get_all_unfiltered (collection); #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self = (CoreViewTracker*) core_tracker_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), _tmp3_); + self = (CoreViewTracker*) core_tracker_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (collection, TYPE_DATA_COLLECTION, DataCollection), _tmp1_); #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 1116 "Tracker.c" +#line 1258 "Tracker.c" } -CoreViewTracker* core_view_tracker_new (ViewCollection* collection) { +CoreViewTracker* +core_view_tracker_new (ViewCollection* collection) +{ #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala" return core_view_tracker_construct (CORE_TYPE_VIEW_TRACKER, collection); -#line 1123 "Tracker.c" +#line 1267 "Tracker.c" } -void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { +void +core_view_tracker_start (CoreViewTracker* self, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected) +{ CoreViewTrackerMux* _tmp0_; - CoreTrackerAccumulator* _tmp1_; - CoreTrackerAccumulator* _tmp2_; - CoreTrackerAccumulator* _tmp3_; - CoreViewTrackerMux* _tmp4_; + CoreViewTrackerMux* _tmp1_; ViewCollection* collection = NULL; - DataCollection* _tmp5_; - ViewCollection* _tmp6_; - CoreViewTrackerMux* _tmp7_; + DataCollection* _tmp2_; + ViewCollection* _tmp3_; + CoreViewTrackerMux* _tmp4_; #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_VIEW_TRACKER (self)); #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1146,29 +1292,23 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all #line 181 "/home/jens/Source/shotwell/src/core/Tracker.vala" _vala_assert (_tmp0_ == NULL, "mux == null"); #line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = all; -#line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = visible; -#line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = selected; -#line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = core_view_tracker_mux_new (_tmp1_, _tmp2_, _tmp3_); + _tmp1_ = core_view_tracker_mux_new (all, visible, selected); #line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->mux); #line 183 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->priv->mux = _tmp4_; + self->priv->mux = _tmp1_; #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = core_tracker_get_collection (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker)); + _tmp2_ = core_tracker_get_collection (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker)); #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIEW_COLLECTION) ? ((ViewCollection*) _tmp5_) : NULL; + _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_VIEW_COLLECTION) ? ((ViewCollection*) _tmp2_) : NULL; #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_ == NULL) { + if (_tmp3_ == NULL) { #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _data_collection_unref0 (_tmp5_); -#line 1169 "Tracker.c" + _data_collection_unref0 (_tmp2_); +#line 1309 "Tracker.c" } #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" - collection = _tmp6_; + collection = _tmp3_; #line 186 "/home/jens/Source/shotwell/src/core/Tracker.vala" _vala_assert (collection != NULL, "collection != null"); #line 187 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1180,16 +1320,19 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all #line 190 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_signal_connect (collection, "items-unselected", (GCallback) _core_view_tracker_on_items_unselected_view_collection_items_unselected, self); #line 192 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = self->priv->mux; + _tmp4_ = self->priv->mux; #line 192 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); + core_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (collection); -#line 1189 "Tracker.c" +#line 1329 "Tracker.c" } -static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollection* shown) { +static void +core_view_tracker_on_items_shown (CoreViewTracker* self, + GeeCollection* shown) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1202,24 +1345,24 @@ static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollecti _tmp1_ = _tmp0_->visible; #line 196 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1206 "Tracker.c" - GeeCollection* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; +#line 1349 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = shown; + _tmp2_ = self->priv->mux; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp3_ = _tmp2_->visible; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->visible; -#line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_); -#line 1218 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (shown, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp3_); +#line 1358 "Tracker.c" } } -static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollection* hidden) { +static void +core_view_tracker_on_items_hidden (CoreViewTracker* self, + GeeCollection* hidden) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1232,24 +1375,24 @@ static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollect _tmp1_ = _tmp0_->visible; #line 201 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1236 "Tracker.c" - GeeCollection* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; -#line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = hidden; +#line 1379 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp2_ = self->priv->mux; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->visible; + _tmp3_ = _tmp2_->visible; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_); -#line 1248 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (hidden, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp3_); +#line 1388 "Tracker.c" } } -static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeIterable* selected) { +static void +core_view_tracker_on_items_selected (CoreViewTracker* self, + GeeIterable* selected) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1262,24 +1405,24 @@ static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeItera _tmp1_ = _tmp0_->selected; #line 206 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1266 "Tracker.c" - GeeIterable* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; -#line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = selected; +#line 1409 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp2_ = self->priv->mux; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->selected; + _tmp3_ = _tmp2_->selected; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_); -#line 1278 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), selected, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp3_); +#line 1418 "Tracker.c" } } -static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIterable* unselected) { +static void +core_view_tracker_on_items_unselected (CoreViewTracker* self, + GeeIterable* unselected) +{ CoreViewTrackerMux* _tmp0_; CoreTrackerAccumulator* _tmp1_; #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1292,31 +1435,30 @@ static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIte _tmp1_ = _tmp0_->selected; #line 211 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp1_ != NULL) { -#line 1296 "Tracker.c" - GeeIterable* _tmp2_; - CoreViewTrackerMux* _tmp3_; - CoreTrackerAccumulator* _tmp4_; -#line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = unselected; +#line 1439 "Tracker.c" + CoreViewTrackerMux* _tmp2_; + CoreTrackerAccumulator* _tmp3_; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = self->priv->mux; + _tmp2_ = self->priv->mux; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = _tmp3_->selected; + _tmp3_ = _tmp2_->selected; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" - core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_); -#line 1308 "Tracker.c" + core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), unselected, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp3_); +#line 1448 "Tracker.c" } } -static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { +static CoreViewTrackerMux* +core_view_tracker_mux_construct (GType object_type, + CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected) +{ CoreViewTrackerMux * self = NULL; CoreTrackerAccumulator* _tmp0_; CoreTrackerAccumulator* _tmp1_; CoreTrackerAccumulator* _tmp2_; - CoreTrackerAccumulator* _tmp3_; - CoreTrackerAccumulator* _tmp4_; - CoreTrackerAccumulator* _tmp5_; #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail ((all == NULL) || CORE_IS_TRACKER_ACCUMULATOR (all), NULL); #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1326,195 +1468,178 @@ static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, C #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = (CoreViewTrackerMux*) g_object_new (object_type, NULL); #line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = all; -#line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (all); #line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->all); #line 106 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->all = _tmp1_; + self->all = _tmp0_; #line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = visible; -#line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (visible); #line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->visible); #line 107 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->visible = _tmp3_; -#line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = selected; + self->visible = _tmp1_; #line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp2_ = _g_object_ref0 (selected); #line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->selected); #line 108 "/home/jens/Source/shotwell/src/core/Tracker.vala" - self->selected = _tmp5_; + self->selected = _tmp2_; #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 1355 "Tracker.c" +#line 1491 "Tracker.c" } -static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { +static CoreViewTrackerMux* +core_view_tracker_mux_new (CoreTrackerAccumulator* all, + CoreTrackerAccumulator* visible, + CoreTrackerAccumulator* selected) +{ #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" return core_view_tracker_mux_construct (CORE_VIEW_TRACKER_TYPE_MUX, all, visible, selected); -#line 1362 "Tracker.c" +#line 1502 "Tracker.c" } -static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +core_view_tracker_mux_real_include (CoreTrackerAccumulator* base, + DataObject* object) +{ CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_; - gboolean _tmp8_ = FALSE; - CoreTrackerAccumulator* _tmp9_; - gboolean _tmp17_ = FALSE; - CoreTrackerAccumulator* _tmp18_; + CoreTrackerAccumulator* _tmp1_; + gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp7_; + gboolean _tmp13_ = FALSE; + CoreTrackerAccumulator* _tmp14_; #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 112 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 112 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 112 "/home/jens/Source/shotwell/src/core/Tracker.vala" - view = _tmp1_; + view = _tmp0_; #line 114 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; #line 116 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = self->all; + _tmp1_ = self->all; #line 116 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp2_ != NULL) { -#line 1394 "Tracker.c" - gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_; - DataView* _tmp5_; - gboolean _tmp6_; -#line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->all; + if (_tmp1_ != NULL) { +#line 1534 "Tracker.c" + gboolean _tmp2_ = FALSE; + CoreTrackerAccumulator* _tmp3_; + DataView* _tmp4_; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = view; + _tmp3_ = self->all; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = core_tracker_accumulator_include (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = view; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_) { + if (core_tracker_accumulator_include (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject))) { #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = TRUE; -#line 1409 "Tracker.c" + _tmp2_ = TRUE; +#line 1546 "Tracker.c" } else { - gboolean _tmp7_; + gboolean _tmp5_; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = fire_updated; + _tmp5_ = fire_updated; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp7_; -#line 1416 "Tracker.c" + _tmp2_ = _tmp5_; +#line 1553 "Tracker.c" } #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp3_; -#line 1420 "Tracker.c" + fire_updated = _tmp2_; +#line 1557 "Tracker.c" } #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = self->visible; -#line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_ != NULL) { -#line 1426 "Tracker.c" - DataView* _tmp10_; - gboolean _tmp11_; + _tmp7_ = self->visible; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = view; + if (_tmp7_ != NULL) { +#line 1563 "Tracker.c" + DataView* _tmp8_; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = data_view_is_visible (_tmp10_); + _tmp8_ = view; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = _tmp11_; -#line 1435 "Tracker.c" + _tmp6_ = data_view_is_visible (_tmp8_); +#line 1569 "Tracker.c" } else { #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = FALSE; -#line 1439 "Tracker.c" + _tmp6_ = FALSE; +#line 1573 "Tracker.c" } #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp8_) { -#line 1443 "Tracker.c" - gboolean _tmp12_ = FALSE; - CoreTrackerAccumulator* _tmp13_; - DataView* _tmp14_; - gboolean _tmp15_; -#line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = self->visible; + if (_tmp6_) { +#line 1577 "Tracker.c" + gboolean _tmp9_ = FALSE; + CoreTrackerAccumulator* _tmp10_; + DataView* _tmp11_; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = view; + _tmp10_ = self->visible; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = core_tracker_accumulator_include (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp11_ = view; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp15_) { + if (core_tracker_accumulator_include (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject))) { #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = TRUE; -#line 1458 "Tracker.c" + _tmp9_ = TRUE; +#line 1589 "Tracker.c" } else { - gboolean _tmp16_; + gboolean _tmp12_; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = fire_updated; + _tmp12_ = fire_updated; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = _tmp16_; -#line 1465 "Tracker.c" + _tmp9_ = _tmp12_; +#line 1596 "Tracker.c" } #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp12_; -#line 1469 "Tracker.c" + fire_updated = _tmp9_; +#line 1600 "Tracker.c" } #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = self->selected; + _tmp14_ = self->selected; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp18_ != NULL) { -#line 1475 "Tracker.c" - DataView* _tmp19_; - gboolean _tmp20_; -#line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = view; + if (_tmp14_ != NULL) { +#line 1606 "Tracker.c" + DataView* _tmp15_; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = data_view_is_selected (_tmp19_); + _tmp15_ = view; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = _tmp20_; -#line 1484 "Tracker.c" + _tmp13_ = data_view_is_selected (_tmp15_); +#line 1612 "Tracker.c" } else { #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = FALSE; -#line 1488 "Tracker.c" + _tmp13_ = FALSE; +#line 1616 "Tracker.c" } #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp17_) { -#line 1492 "Tracker.c" - gboolean _tmp21_ = FALSE; - CoreTrackerAccumulator* _tmp22_; - DataView* _tmp23_; - gboolean _tmp24_; -#line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp22_ = self->selected; + if (_tmp13_) { +#line 1620 "Tracker.c" + gboolean _tmp16_ = FALSE; + CoreTrackerAccumulator* _tmp17_; + DataView* _tmp18_; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = view; + _tmp17_ = self->selected; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp24_ = core_tracker_accumulator_include (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); + _tmp18_ = view; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp24_) { + if (core_tracker_accumulator_include (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject))) { #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = TRUE; -#line 1507 "Tracker.c" + _tmp16_ = TRUE; +#line 1632 "Tracker.c" } else { - gboolean _tmp25_; + gboolean _tmp19_; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp25_ = fire_updated; + _tmp19_ = fire_updated; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = _tmp25_; -#line 1514 "Tracker.c" + _tmp16_ = _tmp19_; +#line 1639 "Tracker.c" } #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp21_; -#line 1518 "Tracker.c" + fire_updated = _tmp16_; +#line 1643 "Tracker.c" } #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1522,163 +1647,148 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base _g_object_unref0 (view); #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 1526 "Tracker.c" +#line 1651 "Tracker.c" } -static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, DataObject* object) { +static gboolean +core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, + DataObject* object) +{ CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_; - gboolean _tmp8_ = FALSE; - CoreTrackerAccumulator* _tmp9_; - gboolean _tmp17_ = FALSE; - CoreTrackerAccumulator* _tmp18_; + CoreTrackerAccumulator* _tmp1_; + gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp7_; + gboolean _tmp13_ = FALSE; + CoreTrackerAccumulator* _tmp14_; #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 129 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = object; -#line 129 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 129 "/home/jens/Source/shotwell/src/core/Tracker.vala" - view = _tmp1_; + view = _tmp0_; #line 131 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; #line 133 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = self->all; + _tmp1_ = self->all; #line 133 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp2_ != NULL) { -#line 1558 "Tracker.c" - gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_; - DataView* _tmp5_; - gboolean _tmp6_; -#line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->all; + if (_tmp1_ != NULL) { +#line 1683 "Tracker.c" + gboolean _tmp2_ = FALSE; + CoreTrackerAccumulator* _tmp3_; + DataView* _tmp4_; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = view; + _tmp3_ = self->all; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = core_tracker_accumulator_uninclude (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = view; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp6_) { + if (core_tracker_accumulator_uninclude (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject))) { #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = TRUE; -#line 1573 "Tracker.c" + _tmp2_ = TRUE; +#line 1695 "Tracker.c" } else { - gboolean _tmp7_; + gboolean _tmp5_; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = fire_updated; + _tmp5_ = fire_updated; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp7_; -#line 1580 "Tracker.c" + _tmp2_ = _tmp5_; +#line 1702 "Tracker.c" } #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp3_; -#line 1584 "Tracker.c" + fire_updated = _tmp2_; +#line 1706 "Tracker.c" } #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = self->visible; + _tmp7_ = self->visible; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_ != NULL) { -#line 1590 "Tracker.c" - DataView* _tmp10_; - gboolean _tmp11_; -#line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = view; + if (_tmp7_ != NULL) { +#line 1712 "Tracker.c" + DataView* _tmp8_; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = data_view_is_visible (_tmp10_); + _tmp8_ = view; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = _tmp11_; -#line 1599 "Tracker.c" + _tmp6_ = data_view_is_visible (_tmp8_); +#line 1718 "Tracker.c" } else { #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = FALSE; -#line 1603 "Tracker.c" + _tmp6_ = FALSE; +#line 1722 "Tracker.c" } #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp8_) { -#line 1607 "Tracker.c" - gboolean _tmp12_ = FALSE; - CoreTrackerAccumulator* _tmp13_; - DataView* _tmp14_; - gboolean _tmp15_; -#line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = self->visible; + if (_tmp6_) { +#line 1726 "Tracker.c" + gboolean _tmp9_ = FALSE; + CoreTrackerAccumulator* _tmp10_; + DataView* _tmp11_; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = view; + _tmp10_ = self->visible; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = core_tracker_accumulator_uninclude (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp11_ = view; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp15_) { + if (core_tracker_accumulator_uninclude (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject))) { #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = TRUE; -#line 1622 "Tracker.c" + _tmp9_ = TRUE; +#line 1738 "Tracker.c" } else { - gboolean _tmp16_; + gboolean _tmp12_; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = fire_updated; + _tmp12_ = fire_updated; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = _tmp16_; -#line 1629 "Tracker.c" + _tmp9_ = _tmp12_; +#line 1745 "Tracker.c" } #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp12_; -#line 1633 "Tracker.c" + fire_updated = _tmp9_; +#line 1749 "Tracker.c" } #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = self->selected; -#line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp18_ != NULL) { -#line 1639 "Tracker.c" - DataView* _tmp19_; - gboolean _tmp20_; + _tmp14_ = self->selected; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = view; + if (_tmp14_ != NULL) { +#line 1755 "Tracker.c" + DataView* _tmp15_; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = data_view_is_selected (_tmp19_); + _tmp15_ = view; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = _tmp20_; -#line 1648 "Tracker.c" + _tmp13_ = data_view_is_selected (_tmp15_); +#line 1761 "Tracker.c" } else { #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = FALSE; -#line 1652 "Tracker.c" + _tmp13_ = FALSE; +#line 1765 "Tracker.c" } #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp17_) { -#line 1656 "Tracker.c" - gboolean _tmp21_ = FALSE; - CoreTrackerAccumulator* _tmp22_; - DataView* _tmp23_; - gboolean _tmp24_; + if (_tmp13_) { +#line 1769 "Tracker.c" + gboolean _tmp16_ = FALSE; + CoreTrackerAccumulator* _tmp17_; + DataView* _tmp18_; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp22_ = self->selected; + _tmp17_ = self->selected; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = view; + _tmp18_ = view; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp24_ = core_tracker_accumulator_uninclude (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject)); + if (core_tracker_accumulator_uninclude (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject))) { #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp24_) { -#line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = TRUE; -#line 1671 "Tracker.c" + _tmp16_ = TRUE; +#line 1781 "Tracker.c" } else { - gboolean _tmp25_; + gboolean _tmp19_; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp25_ = fire_updated; + _tmp19_ = fire_updated; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = _tmp25_; -#line 1678 "Tracker.c" + _tmp16_ = _tmp19_; +#line 1788 "Tracker.c" } #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp21_; -#line 1682 "Tracker.c" + fire_updated = _tmp16_; +#line 1792 "Tracker.c" } #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1686,22 +1796,25 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba _g_object_unref0 (view); #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 1690 "Tracker.c" +#line 1800 "Tracker.c" } -static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) { +static gboolean +core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, + DataObject* object, + Alteration* alteration) +{ CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_; - gboolean _tmp9_ = FALSE; - CoreTrackerAccumulator* _tmp10_; - gboolean _tmp19_ = FALSE; - CoreTrackerAccumulator* _tmp20_; + CoreTrackerAccumulator* _tmp1_; + gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp7_; + gboolean _tmp13_ = FALSE; + CoreTrackerAccumulator* _tmp14_; #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1709,151 +1822,125 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 146 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp0_ = object; -#line 146 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 146 "/home/jens/Source/shotwell/src/core/Tracker.vala" - view = _tmp1_; + view = _tmp0_; #line 148 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = FALSE; #line 150 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp2_ = self->all; + _tmp1_ = self->all; #line 150 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp2_ != NULL) { -#line 1724 "Tracker.c" - gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_; - DataView* _tmp5_; - Alteration* _tmp6_; - gboolean _tmp7_; -#line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp4_ = self->all; -#line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp5_ = view; + if (_tmp1_ != NULL) { +#line 1835 "Tracker.c" + gboolean _tmp2_ = FALSE; + CoreTrackerAccumulator* _tmp3_; + DataView* _tmp4_; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp6_ = alteration; + _tmp3_ = self->all; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp7_ = core_tracker_accumulator_altered (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject), _tmp6_); + _tmp4_ = view; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp7_) { + if (core_tracker_accumulator_altered (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject), alteration)) { #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = TRUE; -#line 1742 "Tracker.c" + _tmp2_ = TRUE; +#line 1847 "Tracker.c" } else { - gboolean _tmp8_; + gboolean _tmp5_; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp8_ = fire_updated; + _tmp5_ = fire_updated; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp3_ = _tmp8_; -#line 1749 "Tracker.c" + _tmp2_ = _tmp5_; +#line 1854 "Tracker.c" } #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp3_; -#line 1753 "Tracker.c" + fire_updated = _tmp2_; +#line 1858 "Tracker.c" } #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp10_ = self->visible; -#line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp10_ != NULL) { -#line 1759 "Tracker.c" - DataView* _tmp11_; - gboolean _tmp12_; + _tmp7_ = self->visible; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp11_ = view; + if (_tmp7_ != NULL) { +#line 1864 "Tracker.c" + DataView* _tmp8_; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp12_ = data_view_is_visible (_tmp11_); + _tmp8_ = view; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = _tmp12_; -#line 1768 "Tracker.c" + _tmp6_ = data_view_is_visible (_tmp8_); +#line 1870 "Tracker.c" } else { #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp9_ = FALSE; -#line 1772 "Tracker.c" + _tmp6_ = FALSE; +#line 1874 "Tracker.c" } #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp9_) { -#line 1776 "Tracker.c" - gboolean _tmp13_ = FALSE; - CoreTrackerAccumulator* _tmp14_; - DataView* _tmp15_; - Alteration* _tmp16_; - gboolean _tmp17_; -#line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp14_ = self->visible; -#line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp15_ = view; + if (_tmp6_) { +#line 1878 "Tracker.c" + gboolean _tmp9_ = FALSE; + CoreTrackerAccumulator* _tmp10_; + DataView* _tmp11_; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp16_ = alteration; + _tmp10_ = self->visible; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp17_ = core_tracker_accumulator_altered (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject), _tmp16_); + _tmp11_ = view; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp17_) { + if (core_tracker_accumulator_altered (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject), alteration)) { #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = TRUE; -#line 1794 "Tracker.c" + _tmp9_ = TRUE; +#line 1890 "Tracker.c" } else { - gboolean _tmp18_; + gboolean _tmp12_; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp18_ = fire_updated; + _tmp12_ = fire_updated; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp13_ = _tmp18_; -#line 1801 "Tracker.c" + _tmp9_ = _tmp12_; +#line 1897 "Tracker.c" } #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp13_; -#line 1805 "Tracker.c" + fire_updated = _tmp9_; +#line 1901 "Tracker.c" } #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp20_ = self->selected; -#line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp20_ != NULL) { -#line 1811 "Tracker.c" - DataView* _tmp21_; - gboolean _tmp22_; + _tmp14_ = self->selected; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp21_ = view; + if (_tmp14_ != NULL) { +#line 1907 "Tracker.c" + DataView* _tmp15_; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp22_ = data_view_is_selected (_tmp21_); + _tmp15_ = view; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = _tmp22_; -#line 1820 "Tracker.c" + _tmp13_ = data_view_is_selected (_tmp15_); +#line 1913 "Tracker.c" } else { #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp19_ = FALSE; -#line 1824 "Tracker.c" + _tmp13_ = FALSE; +#line 1917 "Tracker.c" } #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp19_) { -#line 1828 "Tracker.c" - gboolean _tmp23_ = FALSE; - CoreTrackerAccumulator* _tmp24_; - DataView* _tmp25_; - Alteration* _tmp26_; - gboolean _tmp27_; + if (_tmp13_) { +#line 1921 "Tracker.c" + gboolean _tmp16_ = FALSE; + CoreTrackerAccumulator* _tmp17_; + DataView* _tmp18_; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp24_ = self->selected; + _tmp17_ = self->selected; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp25_ = view; + _tmp18_ = view; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp26_ = alteration; + if (core_tracker_accumulator_altered (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), alteration)) { #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp27_ = core_tracker_accumulator_altered (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject), _tmp26_); -#line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - if (_tmp27_) { -#line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = TRUE; -#line 1846 "Tracker.c" + _tmp16_ = TRUE; +#line 1933 "Tracker.c" } else { - gboolean _tmp28_; + gboolean _tmp19_; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp28_ = fire_updated; + _tmp19_ = fire_updated; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - _tmp23_ = _tmp28_; -#line 1853 "Tracker.c" + _tmp16_ = _tmp19_; +#line 1940 "Tracker.c" } #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" - fire_updated = _tmp23_; -#line 1857 "Tracker.c" + fire_updated = _tmp16_; +#line 1944 "Tracker.c" } #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1861,20 +1948,24 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base _g_object_unref0 (view); #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 1865 "Tracker.c" +#line 1952 "Tracker.c" } -static void core_view_tracker_mux_class_init (CoreViewTrackerMuxClass * klass) { +static void +core_view_tracker_mux_class_init (CoreViewTrackerMuxClass * klass) +{ #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_mux_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" G_OBJECT_CLASS (klass)->finalize = core_view_tracker_mux_finalize; -#line 1874 "Tracker.c" +#line 1963 "Tracker.c" } -static void core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) { +static void +core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) +{ #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_mux_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface); #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1883,15 +1974,19 @@ static void core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreT iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) core_view_tracker_mux_real_uninclude; #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) core_view_tracker_mux_real_altered; -#line 1887 "Tracker.c" +#line 1978 "Tracker.c" } -static void core_view_tracker_mux_instance_init (CoreViewTrackerMux * self) { +static void +core_view_tracker_mux_instance_init (CoreViewTrackerMux * self) +{ } -static void core_view_tracker_mux_finalize (GObject * obj) { +static void +core_view_tracker_mux_finalize (GObject * obj) +{ CoreViewTrackerMux * self; #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux); @@ -1903,11 +1998,13 @@ static void core_view_tracker_mux_finalize (GObject * obj) { _g_object_unref0 (self->selected); #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" G_OBJECT_CLASS (core_view_tracker_mux_parent_class)->finalize (obj); -#line 1907 "Tracker.c" +#line 2002 "Tracker.c" } -static GType core_view_tracker_mux_get_type (void) { +static GType +core_view_tracker_mux_get_type (void) +{ static volatile gsize core_view_tracker_mux_type_id__volatile = 0; if (g_once_init_enter (&core_view_tracker_mux_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CoreViewTrackerMuxClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) core_view_tracker_mux_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CoreViewTrackerMux), 0, (GInstanceInitFunc) core_view_tracker_mux_instance_init, NULL }; @@ -1921,27 +2018,33 @@ static GType core_view_tracker_mux_get_type (void) { } -static void core_view_tracker_class_init (CoreViewTrackerClass * klass) { +static void +core_view_tracker_class_init (CoreViewTrackerClass * klass) +{ #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" core_view_tracker_parent_class = g_type_class_peek_parent (klass); #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" ((CoreTrackerClass *) klass)->finalize = core_view_tracker_finalize; #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_type_class_add_private (klass, sizeof (CoreViewTrackerPrivate)); -#line 1932 "Tracker.c" +#line 2031 "Tracker.c" } -static void core_view_tracker_instance_init (CoreViewTracker * self) { +static void +core_view_tracker_instance_init (CoreViewTracker * self) +{ #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv = CORE_VIEW_TRACKER_GET_PRIVATE (self); #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv->mux = NULL; -#line 1941 "Tracker.c" +#line 2042 "Tracker.c" } -static void core_view_tracker_finalize (CoreTracker * obj) { +static void +core_view_tracker_finalize (CoreTracker * obj) +{ CoreViewTracker * self; CoreViewTrackerMux* _tmp0_; #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1950,7 +2053,7 @@ static void core_view_tracker_finalize (CoreTracker * obj) { _tmp0_ = self->priv->mux; #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp0_ != NULL) { -#line 1954 "Tracker.c" +#line 2057 "Tracker.c" ViewCollection* collection = NULL; DataCollection* _tmp1_; ViewCollection* _tmp2_; @@ -1971,7 +2074,7 @@ static void core_view_tracker_finalize (CoreTracker * obj) { if (_tmp2_ == NULL) { #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (_tmp1_); -#line 1975 "Tracker.c" +#line 2078 "Tracker.c" } #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala" collection = _tmp2_; @@ -2005,17 +2108,19 @@ static void core_view_tracker_finalize (CoreTracker * obj) { g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _core_view_tracker_on_items_unselected_view_collection_items_unselected, self); #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (collection); -#line 2009 "Tracker.c" +#line 2112 "Tracker.c" } #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (self->priv->mux); #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" CORE_TRACKER_CLASS (core_view_tracker_parent_class)->finalize (obj); -#line 2015 "Tracker.c" +#line 2118 "Tracker.c" } -GType core_view_tracker_get_type (void) { +GType +core_view_tracker_get_type (void) +{ static volatile gsize core_view_tracker_type_id__volatile = 0; if (g_once_init_enter (&core_view_tracker_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CoreViewTrackerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) core_view_tracker_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CoreViewTracker), 0, (GInstanceInitFunc) core_view_tracker_instance_init, NULL }; diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c index f1dc3ad..20c7fd1 100644 --- a/src/core/ViewCollection.c +++ b/src/core/ViewCollection.c @@ -1,4 +1,4 @@ -/* ViewCollection.c generated by valac 0.36.6, the Vala compiler +/* ViewCollection.c generated by valac 0.40.4, the Vala compiler * generated from ViewCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -21,6 +21,7 @@ /* The default implementation provides a browser which orders the view in the order they're*/ /* stored in DataCollection, which is not specified.*/ + #include #include #include @@ -202,6 +203,11 @@ typedef struct _ViewCollectionToggleListsClass ViewCollectionToggleListsClass; typedef struct _ViewCollectionToggleListsPrivate ViewCollectionToggleListsPrivate; typedef struct _ViewCollectionParamSpecMonitor ViewCollectionParamSpecMonitor; #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL))) +enum { + VIEW_COLLECTION_TOGGLE_LISTS_0_PROPERTY, + VIEW_COLLECTION_TOGGLE_LISTS_NUM_PROPERTIES +}; +static GParamSpec* view_collection_toggle_lists_properties[VIEW_COLLECTION_TOGGLE_LISTS_NUM_PROPERTIES]; enum { VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL, VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL, @@ -216,18 +222,18 @@ enum { VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL, VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL, VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL, - VIEW_COLLECTION_LAST_SIGNAL + VIEW_COLLECTION_NUM_SIGNALS }; -static guint view_collection_signals[VIEW_COLLECTION_LAST_SIGNAL] = {0}; +static guint view_collection_signals[VIEW_COLLECTION_NUM_SIGNALS] = {0}; typedef struct _ViewManagerPrivate ViewManagerPrivate; typedef struct _ParamSpecViewManager ParamSpecViewManager; typedef struct _ViewFilterPrivate ViewFilterPrivate; typedef struct _ParamSpecViewFilter ParamSpecViewFilter; enum { VIEW_FILTER_REFRESH_SIGNAL, - VIEW_FILTER_LAST_SIGNAL + VIEW_FILTER_NUM_SIGNALS }; -static guint view_filter_signals[VIEW_FILTER_LAST_SIGNAL] = {0}; +static guint view_filter_signals[VIEW_FILTER_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; } @@ -440,17 +446,29 @@ static gpointer view_filter_parent_class = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -458,60 +476,99 @@ GType view_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; static GType view_collection_monitor_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; GType data_source_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 VIEW_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_VIEW_COLLECTION, ViewCollectionPrivate)) -enum { - VIEW_COLLECTION_DUMMY_PROPERTY -}; DataSet* data_set_new (void); DataSet* data_set_construct (GType object_type); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); DataCollection* data_collection_new (const gchar* name); -DataCollection* data_collection_construct (GType object_type, const gchar* name); -void view_collection_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected); -static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected); +DataCollection* data_collection_construct (GType object_type, + const gchar* name); +void view_collection_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected); +static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected); void view_collection_notify_selection_group_altered (ViewCollection* self); static void view_collection_real_notify_selection_group_altered (ViewCollection* self); -void view_collection_notify_item_view_altered (ViewCollection* self, DataView* view); -static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view); -void view_collection_notify_views_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views); -void view_collection_notify_item_geometry_altered (ViewCollection* self, DataView* view); -static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view); -void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views); -void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* shown); -static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown); -void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* hidden); -static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden); -void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed); -static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed); -void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter); -static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter); -void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter); -static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter); +void view_collection_notify_item_view_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_notify_item_view_altered (ViewCollection* self, + DataView* view); +void view_collection_notify_views_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_notify_views_altered (ViewCollection* self, + GeeCollection* views); +void view_collection_notify_item_geometry_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, + DataView* view); +void view_collection_notify_geometries_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_notify_geometries_altered (ViewCollection* self, + GeeCollection* views); +void view_collection_notify_items_shown (ViewCollection* self, + GeeCollection* shown); +static void view_collection_real_notify_items_shown (ViewCollection* self, + GeeCollection* shown); +void view_collection_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden); +static void view_collection_real_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden); +void view_collection_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed); +static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed); +void view_collection_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter); +static void view_collection_real_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter); +void view_collection_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter); +static void view_collection_real_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter); static void view_collection_real_clear (DataCollection* base); gchar* data_collection_to_string (DataCollection* self); void data_collection_clear (DataCollection* self); @@ -519,79 +576,179 @@ static void view_collection_real_close (DataCollection* base); void view_collection_halt_all_monitoring (ViewCollection* self); void view_collection_halt_mirroring (ViewCollection* self); static void view_collection_on_view_filter_refresh (ViewCollection* self); -static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self); +static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, + gpointer self); void data_collection_close (DataCollection* self); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); void data_collection_freeze_notifications (DataCollection* self); -static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq); -static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq); -DataView* view_manager_create_view (ViewManager* self, DataSource* source); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -static void view_collection_add_sources (ViewCollection* self, SourceCollection* sources, GeeIterable* added, ProgressMonitor progress_monitor, void* progress_monitor_target); +static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq); +static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, + ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq); +DataView* view_manager_create_view (ViewManager* self, + DataSource* source); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +static void view_collection_add_sources (ViewCollection* self, + SourceCollection* sources, + GeeIterable* added, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GeeCollection* data_collection_get_all (DataCollection* self); void data_collection_thaw_notifications (DataCollection* self); -void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m); -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -Comparator data_collection_get_comparator (DataCollection* self, void** result_target); -ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target); -static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added); -static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed); -static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target); +void view_collection_halt_monitoring (ViewCollection* self, + ViewCollectionMonitor* m); +void view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +Comparator data_collection_get_comparator (DataCollection* self, + void** result_target); +ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, + void** result_target); +static void view_collection_on_mirror_contents_added (ViewCollection* self, + GeeIterable* added); +static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void view_collection_on_mirror_contents_removed (ViewCollection* self, + GeeIterable* removed); +static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +void view_collection_copy_into (ViewCollection* self, + ViewCollection* to_copy, + CreateView copying_ctor, + void* copying_ctor_target, + CreateViewPredicate should_copy, + void* should_copy_target); DataSource* data_view_get_source (DataView* self); -gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f); -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f); -void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f); -static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views); -static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* view); -gboolean view_filter_predicate (ViewFilter* self, DataView* view); -static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object); -static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added); -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); -static DataView* _view_manager_create_view_create_view (DataSource* source, gpointer self); -gboolean data_collection_add (DataCollection* self, DataObject* object); -static gboolean view_collection_real_add (DataCollection* base, DataObject* object); -void data_view_internal_set_visible (DataView* self, gboolean visible); +gboolean view_collection_is_view_filter_installed (ViewCollection* self, + ViewFilter* f); +void view_collection_install_view_filter (ViewCollection* self, + ViewFilter* f); +void view_collection_remove_view_filter (ViewCollection* self, + ViewFilter* f); +static void view_collection_filter_altered_items (ViewCollection* self, + GeeCollection* views); +static gboolean view_collection_is_in_filter (ViewCollection* self, + DataView* view); +gboolean view_filter_predicate (ViewFilter* self, + DataView* view); +static gboolean view_collection_real_valid_type (DataCollection* base, + DataObject* object); +static void view_collection_on_sources_added (ViewCollection* self, + DataCollection* sources, + GeeIterable* added); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); +static DataView* _view_manager_create_view_create_view (DataSource* source, + gpointer self); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +static gboolean view_collection_real_add (DataCollection* base, + DataObject* object); +void data_view_internal_set_visible (DataView* self, + gboolean visible); GeeCollection* data_collection_get_singleton (DataObject* object); -static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed); +static GeeCollection* view_collection_real_add_many (DataCollection* base, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +static void view_collection_on_sources_removed (ViewCollection* self, + GeeIterable* removed); Marker* data_collection_start_marking (DataCollection* self); -void marker_mark (Marker* self, DataObject* object); +void marker_mark (Marker* self, + DataObject* object); gint marker_get_count (Marker* self); -void data_collection_remove_marked (DataCollection* self, Marker* m); -static void view_collection_on_sources_altered (ViewCollection* self, DataCollection* collection, GeeMap* items); -gboolean alteration_contains_any (Alteration* self, Alteration* other); -gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -gboolean data_set_contains (DataSet* self, DataObject* object); -gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration); -static gboolean view_collection_is_visible (ViewCollection* self, DataView* view); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +static void view_collection_on_sources_altered (ViewCollection* self, + DataCollection* collection, + GeeMap* items); +gboolean alteration_contains_any (Alteration* self, + Alteration* other); +gboolean view_collection_has_view_for_source (ViewCollection* self, + DataSource* source); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +gboolean data_set_contains (DataSet* self, + DataObject* object); +gboolean data_set_resort_object (DataSet* self, + DataObject* object, + Alteration* alteration); +static gboolean view_collection_is_visible (ViewCollection* self, + DataView* view); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); void data_collection_notify_ordering_changed (DataCollection* self); -static void view_collection_real_notify_items_added (DataCollection* base, GeeIterable* added); +static void view_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added); gboolean data_view_is_selected (DataView* self); gboolean data_view_is_visible (DataView* self); -static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many); -static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed); -gboolean data_set_remove (DataSet* self, DataObject* object); -static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -static void view_collection_show_items (ViewCollection* self, GeeList* to_show); -static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide); -static void view_collection_real_items_altered (DataCollection* base, GeeMap* map); -static void view_collection_real_set_comparator (DataCollection* base, 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); +static gboolean view_collection_add_many_visible (ViewCollection* self, + GeeCollection* many); +static void view_collection_add_many_selected (ViewCollection* self, + GeeCollection* views); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void view_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed); +gboolean data_set_remove (DataSet* self, + DataObject* object); +static void view_collection_remove_many_selected (ViewCollection* self, + GeeCollection* views); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +static void view_collection_show_items (ViewCollection* self, + GeeList* to_show); +static void view_collection_hide_items (ViewCollection* self, + GeeList* to_hide); +static void view_collection_real_items_altered (DataCollection* base, + GeeMap* map); +static void view_collection_real_set_comparator (DataCollection* base, + 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); static void view_collection_real_reset_comparator (DataCollection* base); void data_set_reset_comparator (DataSet* self); void data_collection_reset_comparator (DataCollection* self); @@ -602,14 +759,22 @@ static gint view_collection_real_get_count (DataCollection* base); gint data_set_get_count (DataSet* self); gint data_collection_get_count (DataCollection* self); gint view_collection_get_unfiltered_count (ViewCollection* self); -static DataObject* view_collection_real_get_at (DataCollection* base, gint index); -DataObject* data_set_get_at (DataSet* self, gint index); -DataObject* data_collection_get_at (DataCollection* self, gint index); -static gint view_collection_real_index_of (DataCollection* base, DataObject* object); -gint data_set_index_of (DataSet* self, DataObject* object); -gint data_collection_index_of (DataCollection* self, DataObject* object); -static gboolean view_collection_real_contains (DataCollection* base, DataObject* object); -gboolean data_collection_contains (DataCollection* self, DataObject* object); +static DataObject* view_collection_real_get_at (DataCollection* base, + gint index); +DataObject* data_set_get_at (DataSet* self, + gint index); +DataObject* data_collection_get_at (DataCollection* self, + gint index); +static gint view_collection_real_index_of (DataCollection* base, + DataObject* object); +gint data_set_index_of (DataSet* self, + DataObject* object); +gint data_collection_index_of (DataCollection* self, + DataObject* object); +static gboolean view_collection_real_contains (DataCollection* base, + DataObject* object); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); DataView* view_collection_get_first (ViewCollection* self); static DataView* view_collection_real_get_first (ViewCollection* self); DataView* view_collection_get_first_unrejected (ViewCollection* self); @@ -618,576 +783,649 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); -DataView* view_collection_get_next (ViewCollection* self, DataView* view); +DataView* view_collection_get_next (ViewCollection* self, + DataView* view); DataView* view_collection_get_last (ViewCollection* self); static DataView* view_collection_real_get_last (ViewCollection* self); -static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view); -DataView* view_collection_get_previous (ViewCollection* self, DataView* view); -static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view); -gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector); +static DataView* view_collection_real_get_next (ViewCollection* self, + DataView* view); +DataView* view_collection_get_previous (ViewCollection* self, + DataView* view); +static DataView* view_collection_real_get_previous (ViewCollection* self, + DataView* view); +gboolean view_collection_get_immediate_neighbors (ViewCollection* self, + DataSource* home, + DataSource* * next, + DataSource* * prev, + const gchar* type_selector); gchar* data_source_get_typename (DataSource* self); -GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename); -gboolean data_set_add_many (DataSet* self, GeeCollection* objects); -gboolean data_set_remove_many (DataSet* self, GeeCollection* objects); -void view_collection_select_marked (ViewCollection* self, Marker* marker); -void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedAction action, void* action_target, ProgressMonitor monitor, void* monitor_target, GObject* user); -static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user); -static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self); +GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, + DataSource* home, + const gchar* typename); +gboolean data_set_add_many (DataSet* self, + GeeCollection* objects); +gboolean data_set_remove_many (DataSet* self, + GeeCollection* objects); +void view_collection_select_marked (ViewCollection* self, + Marker* marker); +void data_collection_act_on_marked (DataCollection* self, + Marker* m, + MarkedAction action, + void* action_target, + ProgressMonitor monitor, + void* monitor_target, + GObject* user); +static gboolean view_collection_select_item (ViewCollection* self, + DataObject* object, + GObject* user); +static gboolean _view_collection_select_item_marked_action (DataObject* object, + GObject* user, + gpointer self); void view_collection_select_all (ViewCollection* self); void marker_mark_all (Marker* self); -void data_view_internal_set_selected (DataView* self, gboolean selected); -void view_collection_unselect_marked (ViewCollection* self, Marker* marker); -static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user); -static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self); +void data_view_internal_set_selected (DataView* self, + gboolean selected); +void view_collection_unselect_marked (ViewCollection* self, + Marker* marker); +static gboolean view_collection_unselect_item (ViewCollection* self, + DataObject* object, + GObject* user); +static gboolean _view_collection_unselect_item_marked_action (DataObject* object, + GObject* user, + gpointer self); void view_collection_unselect_all (ViewCollection* self); -void marker_mark_many (Marker* self, GeeCollection* list); +void marker_mark_many (Marker* self, + GeeCollection* list); GeeList* view_collection_get_selected (ViewCollection* self); -void view_collection_unselect_all_but (ViewCollection* self, DataView* exception); -void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select); -void view_collection_toggle_marked (ViewCollection* self, Marker* marker); +void view_collection_unselect_all_but (ViewCollection* self, + DataView* exception); +void view_collection_unselect_and_select_marked (ViewCollection* self, + Marker* unselect, + Marker* select); +void view_collection_toggle_marked (ViewCollection* self, + Marker* marker); static GType view_collection_toggle_lists_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static ViewCollectionToggleLists* view_collection_toggle_lists_new (void); static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType object_type); -static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user); -static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self); +static gboolean view_collection_toggle_item (ViewCollection* self, + DataObject* object, + GObject* user); +static gboolean _view_collection_toggle_item_marked_action (DataObject* object, + GObject* user, + gpointer self); gboolean data_view_internal_toggle (DataView* self); gint view_collection_get_selected_count (ViewCollection* self); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSet* data_collection_get_dataset_copy (DataCollection* self); -gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source); -DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source); +gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, + DataSource* source); +DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, + DataSource* source); GeeCollection* view_collection_get_sources (ViewCollection* self); -gboolean view_collection_has_source_of_type (ViewCollection* self, GType t); -gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t); -GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t); +gboolean view_collection_has_source_of_type (ViewCollection* self, + GType t); +gint view_collection_get_sources_of_type_count (ViewCollection* self, + GType t); +GeeList* view_collection_get_sources_of_type (ViewCollection* self, + GType t); GeeList* view_collection_get_selected_sources (ViewCollection* self); -DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index); -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); -gint view_collection_index_of_source (ViewCollection* self, DataSource* source); -void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view); +DataSource* view_collection_get_selected_source_at (ViewCollection* self, + gint index); +GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t); +gint view_collection_index_of_source (ViewCollection* self, + DataSource* source); +void view_collection_internal_notify_view_altered (ViewCollection* self, + DataView* view); gboolean data_collection_are_notifications_frozen (DataCollection* self); -void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view); +void view_collection_internal_notify_geometry_altered (ViewCollection* self, + DataView* view); static void view_collection_real_notify_thawed (DataCollection* base); void data_collection_notify_thawed (DataCollection* self); gboolean view_collection_are_items_filtered_out (ViewCollection* self); -static void view_collection_real_items_selected (ViewCollection* self, GeeIterable* selected); -static void view_collection_real_items_unselected (ViewCollection* self, GeeIterable* unselected); -static void view_collection_real_items_state_changed (ViewCollection* self, GeeIterable* changed); +static void view_collection_real_items_selected (ViewCollection* self, + GeeIterable* selected); +static void view_collection_real_items_unselected (ViewCollection* self, + GeeIterable* unselected); +static void view_collection_real_items_state_changed (ViewCollection* self, + GeeIterable* changed); static void view_collection_real_selection_group_altered (ViewCollection* self); -static void view_collection_real_items_shown (ViewCollection* self, GeeCollection* visible); -static void view_collection_real_items_hidden (ViewCollection* self, GeeCollection* hidden); -static void view_collection_real_items_visibility_changed (ViewCollection* self, GeeCollection* changed); -static void view_collection_real_item_view_altered (ViewCollection* self, DataView* view); -static void view_collection_real_item_geometry_altered (ViewCollection* self, DataView* view); -static void view_collection_real_views_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_geometries_altered (ViewCollection* self, GeeCollection* views); -static void view_collection_real_view_filter_installed (ViewCollection* self, ViewFilter* filer); -static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void view_collection_real_view_filter_removed (ViewCollection* self, ViewFilter* filer); -enum { - VIEW_COLLECTION_MONITOR_DUMMY_PROPERTY -}; +static void view_collection_real_items_shown (ViewCollection* self, + GeeCollection* visible); +static void view_collection_real_items_hidden (ViewCollection* self, + GeeCollection* hidden); +static void view_collection_real_items_visibility_changed (ViewCollection* self, + GeeCollection* changed); +static void view_collection_real_item_view_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_item_geometry_altered (ViewCollection* self, + DataView* view); +static void view_collection_real_views_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_geometries_altered (ViewCollection* self, + GeeCollection* views); +static void view_collection_real_view_filter_installed (ViewCollection* self, + ViewFilter* filer); +static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void view_collection_real_view_filter_removed (ViewCollection* self, + ViewFilter* filer); ViewCollectionMonitor* view_collection_monitor_new (void); ViewCollectionMonitor* view_collection_monitor_construct (GType object_type); static void view_collection_monitor_finalize (ViewCollectionMonitor * obj); -enum { - VIEW_COLLECTION_MONITOR_IMPL_DUMMY_PROPERTY -}; -static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj); -enum { - VIEW_COLLECTION_TOGGLE_LISTS_DUMMY_PROPERTY -}; static void view_collection_toggle_lists_finalize (GObject * obj); static void view_collection_finalize (DataCollection * obj); -enum { - VIEW_MANAGER_DUMMY_PROPERTY -}; -static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source); -static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source); +static gboolean view_manager_real_include_in_view (ViewManager* self, + DataSource* source); +static DataView* view_manager_real_create_view (ViewManager* self, + DataSource* source); ViewManager* view_manager_construct (GType object_type); static void view_manager_finalize (ViewManager * obj); -enum { - VIEW_FILTER_DUMMY_PROPERTY -}; -static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view); +static gboolean view_filter_real_predicate (ViewFilter* self, + DataView* view); ViewFilter* view_filter_construct (GType object_type); static void view_filter_real_refresh (ViewFilter* self); static void view_filter_finalize (ViewFilter * obj); -ViewCollection* view_collection_construct (GType object_type, const gchar* name) { +ViewCollection* +view_collection_construct (GType object_type, + const gchar* name) +{ ViewCollection* self = NULL; - const gchar* _tmp0_; #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (name != NULL, NULL); #line 126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = name; -#line 126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self = (ViewCollection*) data_collection_construct (object_type, _tmp0_); + self = (ViewCollection*) data_collection_construct (object_type, name); #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 733 "ViewCollection.c" +#line 958 "ViewCollection.c" } -ViewCollection* view_collection_new (const gchar* name) { +ViewCollection* +view_collection_new (const gchar* name) +{ #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_construct (TYPE_VIEW_COLLECTION, name); -#line 740 "ViewCollection.c" +#line 967 "ViewCollection.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? g_object_ref (self) : NULL; -#line 747 "ViewCollection.c" +#line 976 "ViewCollection.c" } -static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) { +static void +view_collection_real_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected) +{ gboolean _tmp0_ = FALSE; - GeeCollection* _tmp1_; gboolean has_selected = FALSE; - gboolean _tmp5_ = FALSE; - GeeCollection* _tmp6_; + gboolean _tmp3_ = FALSE; gboolean has_unselected = FALSE; - gboolean _tmp10_; - gboolean _tmp12_; + gboolean _tmp6_; + gboolean _tmp7_; GeeCollection* sum = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_; - GeeCollection* _tmp32_; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_; + GeeCollection* _tmp22_; #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail ((selected == NULL) || GEE_IS_COLLECTION (selected)); #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail ((unselected == NULL) || GEE_IS_COLLECTION (unselected)); #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = selected; -#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ != NULL) { -#line 772 "ViewCollection.c" - GeeCollection* _tmp2_; - gint _tmp3_; - gint _tmp4_; -#line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = selected; + if (selected != NULL) { +#line 1001 "ViewCollection.c" + gint _tmp1_; + gint _tmp2_; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_collection_get_size (_tmp2_); + _tmp1_ = gee_collection_get_size (selected); #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_ > 0; -#line 784 "ViewCollection.c" + _tmp0_ = _tmp2_ > 0; +#line 1010 "ViewCollection.c" } else { #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = FALSE; -#line 788 "ViewCollection.c" +#line 1014 "ViewCollection.c" } #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" has_selected = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = unselected; -#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp6_ != NULL) { -#line 796 "ViewCollection.c" - GeeCollection* _tmp7_; - gint _tmp8_; - gint _tmp9_; -#line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = unselected; + if (unselected != NULL) { +#line 1020 "ViewCollection.c" + gint _tmp4_; + gint _tmp5_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_collection_get_size (_tmp7_); + _tmp4_ = gee_collection_get_size (unselected); #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp9_ > 0; -#line 808 "ViewCollection.c" + _tmp3_ = _tmp5_ > 0; +#line 1029 "ViewCollection.c" } else { #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = FALSE; -#line 812 "ViewCollection.c" + _tmp3_ = FALSE; +#line 1033 "ViewCollection.c" } #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - has_unselected = _tmp5_; + has_unselected = _tmp3_; #line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = has_selected; + _tmp6_ = has_selected; #line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_) { -#line 820 "ViewCollection.c" - GeeCollection* _tmp11_; + if (_tmp6_) { #line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = selected; -#line 135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 826 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_ITERABLE, GeeIterable)); +#line 1043 "ViewCollection.c" } #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = has_unselected; + _tmp7_ = has_unselected; #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp12_) { -#line 832 "ViewCollection.c" - GeeCollection* _tmp13_; -#line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = unselected; + if (_tmp7_) { #line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 838 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_ITERABLE, GeeIterable)); +#line 1051 "ViewCollection.c" } #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = has_selected; + _tmp9_ = has_selected; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 844 "ViewCollection.c" - gboolean _tmp16_; + if (_tmp9_) { +#line 1057 "ViewCollection.c" + gboolean _tmp10_; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = has_unselected; + _tmp10_ = has_unselected; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = !_tmp16_; -#line 850 "ViewCollection.c" + _tmp8_ = !_tmp10_; +#line 1063 "ViewCollection.c" } else { #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = FALSE; -#line 854 "ViewCollection.c" + _tmp8_ = FALSE; +#line 1067 "ViewCollection.c" } #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp14_) { -#line 858 "ViewCollection.c" - GeeCollection* _tmp17_; - GeeCollection* _tmp18_; -#line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = selected; + if (_tmp8_) { +#line 1071 "ViewCollection.c" + GeeCollection* _tmp11_; #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp11_ = _g_object_ref0 (selected); #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sum = _tmp18_; -#line 869 "ViewCollection.c" + sum = _tmp11_; +#line 1079 "ViewCollection.c" } else { - gboolean _tmp19_ = FALSE; - gboolean _tmp20_; + gboolean _tmp12_ = FALSE; + gboolean _tmp13_; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = has_selected; + _tmp13_ = has_selected; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp20_) { -#line 877 "ViewCollection.c" - gboolean _tmp21_; + if (!_tmp13_) { +#line 1087 "ViewCollection.c" + gboolean _tmp14_; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = has_unselected; + _tmp14_ = has_unselected; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = _tmp21_; -#line 883 "ViewCollection.c" + _tmp12_ = _tmp14_; +#line 1093 "ViewCollection.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = FALSE; -#line 887 "ViewCollection.c" + _tmp12_ = FALSE; +#line 1097 "ViewCollection.c" } #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp19_) { -#line 891 "ViewCollection.c" - GeeCollection* _tmp22_; - GeeCollection* _tmp23_; + if (_tmp12_) { +#line 1101 "ViewCollection.c" + GeeCollection* _tmp15_; #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = unselected; -#line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _g_object_ref0 (_tmp22_); + _tmp15_ = _g_object_ref0 (unselected); #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sum = _tmp23_; -#line 902 "ViewCollection.c" + sum = _tmp15_; +#line 1109 "ViewCollection.c" } else { - gboolean _tmp24_ = FALSE; - gboolean _tmp25_; + gboolean _tmp16_ = FALSE; + gboolean _tmp17_; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = has_selected; + _tmp17_ = has_selected; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp25_) { -#line 910 "ViewCollection.c" - gboolean _tmp26_; + if (!_tmp17_) { +#line 1117 "ViewCollection.c" + gboolean _tmp18_; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = has_unselected; + _tmp18_ = has_unselected; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = !_tmp26_; -#line 916 "ViewCollection.c" + _tmp16_ = !_tmp18_; +#line 1123 "ViewCollection.c" } else { #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = FALSE; -#line 920 "ViewCollection.c" + _tmp16_ = FALSE; +#line 1127 "ViewCollection.c" } #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp24_) { + if (_tmp16_) { #line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sum = NULL; -#line 928 "ViewCollection.c" +#line 1135 "ViewCollection.c" } else { - GeeHashSet* _tmp27_; - GeeCollection* _tmp28_; - GeeCollection* _tmp29_; - GeeCollection* _tmp30_; - GeeCollection* _tmp31_; + GeeHashSet* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp19_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sum = G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection); + sum = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection); #line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = sum; + _tmp20_ = sum; #line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = selected; -#line 149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add_all (_tmp28_, _tmp29_); -#line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = sum; + gee_collection_add_all (_tmp20_, selected); #line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = unselected; + _tmp21_ = sum; #line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add_all (_tmp30_, _tmp31_); -#line 953 "ViewCollection.c" + gee_collection_add_all (_tmp21_, unselected); +#line 1154 "ViewCollection.c" } } } #line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = sum; + _tmp22_ = sum; #line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp32_ != NULL) { -#line 961 "ViewCollection.c" - GeeCollection* _tmp33_; + if (_tmp22_ != NULL) { +#line 1162 "ViewCollection.c" + GeeCollection* _tmp23_; #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = sum; + _tmp23_ = sum; #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable)); + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable)); #line 155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_selection_group_altered (self); -#line 969 "ViewCollection.c" +#line 1170 "ViewCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); -#line 973 "ViewCollection.c" +#line 1174 "ViewCollection.c" } -void view_collection_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) { +void +view_collection_notify_items_selected_unselected (ViewCollection* self, + GeeCollection* selected, + GeeCollection* unselected) +{ #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_selected_unselected (self, selected, unselected); -#line 982 "ViewCollection.c" +#line 1187 "ViewCollection.c" } -static void view_collection_real_notify_selection_group_altered (ViewCollection* self) { +static void +view_collection_real_notify_selection_group_altered (ViewCollection* self) +{ #line 160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL], 0); -#line 989 "ViewCollection.c" +#line 1196 "ViewCollection.c" } -void view_collection_notify_selection_group_altered (ViewCollection* self) { +void +view_collection_notify_selection_group_altered (ViewCollection* self) +{ #line 159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_selection_group_altered (self); -#line 998 "ViewCollection.c" +#line 1207 "ViewCollection.c" } -static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view) { - DataView* _tmp0_; +static void +view_collection_real_notify_item_view_altered (ViewCollection* self, + DataView* view) +{ #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = view; -#line 164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, _tmp0_); -#line 1010 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, view); +#line 1219 "ViewCollection.c" } -void view_collection_notify_item_view_altered (ViewCollection* self, DataView* view) { +void +view_collection_notify_item_view_altered (ViewCollection* self, + DataView* view) +{ #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_item_view_altered (self, view); -#line 1019 "ViewCollection.c" +#line 1231 "ViewCollection.c" } -static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_views_altered (ViewCollection* self, + GeeCollection* views) +{ #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); #line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; -#line 168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, _tmp0_); -#line 1031 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, views); +#line 1243 "ViewCollection.c" } -void view_collection_notify_views_altered (ViewCollection* self, GeeCollection* views) { +void +view_collection_notify_views_altered (ViewCollection* self, + GeeCollection* views) +{ #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_views_altered (self, views); -#line 1040 "ViewCollection.c" +#line 1255 "ViewCollection.c" } -static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view) { - DataView* _tmp0_; +static void +view_collection_real_notify_item_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = view; -#line 172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, _tmp0_); -#line 1052 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, view); +#line 1267 "ViewCollection.c" } -void view_collection_notify_item_geometry_altered (ViewCollection* self, DataView* view) { +void +view_collection_notify_item_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_item_geometry_altered (self, view); -#line 1061 "ViewCollection.c" +#line 1279 "ViewCollection.c" } -static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_geometries_altered (ViewCollection* self, + GeeCollection* views) +{ #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); #line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; -#line 176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, _tmp0_); -#line 1073 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, views); +#line 1291 "ViewCollection.c" } -void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollection* views) { +void +view_collection_notify_geometries_altered (ViewCollection* self, + GeeCollection* views) +{ #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 175 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_geometries_altered (self, views); -#line 1082 "ViewCollection.c" +#line 1303 "ViewCollection.c" } -static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_items_shown (ViewCollection* self, + GeeCollection* shown) +{ #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (shown)); #line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = shown; -#line 180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, _tmp0_); -#line 1094 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, shown); +#line 1315 "ViewCollection.c" } -void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* shown) { +void +view_collection_notify_items_shown (ViewCollection* self, + GeeCollection* shown) +{ #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_shown (self, shown); -#line 1103 "ViewCollection.c" +#line 1327 "ViewCollection.c" } -static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden) +{ #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (hidden)); #line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = hidden; -#line 184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, _tmp0_); -#line 1115 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, hidden); +#line 1339 "ViewCollection.c" } -void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) { +void +view_collection_notify_items_hidden (ViewCollection* self, + GeeCollection* hidden) +{ #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_hidden (self, hidden); -#line 1124 "ViewCollection.c" +#line 1351 "ViewCollection.c" } -static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) { - GeeCollection* _tmp0_; +static void +view_collection_real_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed) +{ #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (changed)); #line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = changed; -#line 188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, _tmp0_); -#line 1136 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, changed); +#line 1363 "ViewCollection.c" } -void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) { +void +view_collection_notify_items_visibility_changed (ViewCollection* self, + GeeCollection* changed) +{ #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_items_visibility_changed (self, changed); -#line 1145 "ViewCollection.c" +#line 1375 "ViewCollection.c" } -static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) { - ViewFilter* _tmp0_; +static void +view_collection_real_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter) +{ #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); #line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = filter; -#line 192 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, _tmp0_); -#line 1157 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, filter); +#line 1387 "ViewCollection.c" } -void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) { +void +view_collection_notify_view_filter_installed (ViewCollection* self, + ViewFilter* filter) +{ #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_installed (self, filter); -#line 1166 "ViewCollection.c" +#line 1399 "ViewCollection.c" } -static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) { - ViewFilter* _tmp0_; +static void +view_collection_real_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter) +{ #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); #line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = filter; -#line 196 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, _tmp0_); -#line 1178 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, filter); +#line 1411 "ViewCollection.c" } -void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) { +void +view_collection_notify_view_filter_removed (ViewCollection* self, + ViewFilter* filter) +{ #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_GET_CLASS (self)->notify_view_filter_removed (self, filter); -#line 1187 "ViewCollection.c" +#line 1423 "ViewCollection.c" } -static void view_collection_real_clear (DataCollection* base) { +static void +view_collection_real_clear (DataCollection* base) +{ ViewCollection * self; gboolean _tmp0_ = FALSE; GeeHashMultiMap* _tmp1_; @@ -1205,18 +1443,18 @@ static void view_collection_real_clear (DataCollection* base) { if (_tmp3_ > 0) { #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = TRUE; -#line 1209 "ViewCollection.c" +#line 1447 "ViewCollection.c" } else { ViewCollection* _tmp4_; #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = self->priv->mirroring; #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_ != NULL; -#line 1216 "ViewCollection.c" +#line 1454 "ViewCollection.c" } #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_) { -#line 1220 "ViewCollection.c" +#line 1458 "ViewCollection.c" gchar* _tmp5_; gchar* _tmp6_; #line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1230,31 +1468,36 @@ static void view_collection_real_clear (DataCollection* base) { _g_free0 (_tmp6_); #line 205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1233 "ViewCollection.c" +#line 1471 "ViewCollection.c" } #line 208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1237 "ViewCollection.c" +#line 1475 "ViewCollection.c" } -static void _view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) { +static void +_view_collection_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, + gpointer self) +{ #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_view_filter_refresh ((ViewCollection*) self); -#line 1244 "ViewCollection.c" +#line 1485 "ViewCollection.c" } -static void view_collection_real_close (DataCollection* base) { +static void +view_collection_real_close (DataCollection* base) +{ ViewCollection * self; - GeeSet* _tmp8_; + GeeSet* _tmp7_; #line 211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_halt_all_monitoring (self); #line 213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_halt_mirroring (self); -#line 1257 "ViewCollection.c" +#line 1500 "ViewCollection.c" { GeeIterator* _f_it = NULL; GeeSet* _tmp0_; @@ -1267,66 +1510,66 @@ static void view_collection_real_close (DataCollection* base) { _f_it = _tmp1_; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1270 "ViewCollection.c" +#line 1513 "ViewCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; ViewFilter* f = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - ViewFilter* _tmp6_; - guint _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + ViewFilter* _tmp5_; + guint _tmp6_; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _f_it; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1286 "ViewCollection.c" +#line 1526 "ViewCollection.c" } #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _f_it; + _tmp3_ = _f_it; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - f = (ViewFilter*) _tmp5_; + f = (ViewFilter*) _tmp4_; #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = f; + _tmp5_ = f; #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp7_, NULL, FALSE); + g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp6_, NULL, FALSE); #line 215 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); + g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_filter_unref0 (f); -#line 1302 "ViewCollection.c" +#line 1542 "ViewCollection.c" } #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_f_it); -#line 1306 "ViewCollection.c" +#line 1546 "ViewCollection.c" } #line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->filters; + _tmp7_ = self->priv->filters; #line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1314 "ViewCollection.c" +#line 1554 "ViewCollection.c" } -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target) { +ViewCollectionMonitor* +view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target) +{ ViewCollectionMonitor* result = NULL; ViewCollectionMonitorImpl* monitor = NULL; - SourceCollection* _tmp0_; - ViewManager* _tmp1_; - Alteration* _tmp2_; - ViewCollectionMonitorImpl* _tmp3_; - GeeHashMultiMap* _tmp4_; - SourceCollection* _tmp5_; - ViewCollectionMonitorImpl* _tmp6_; - gboolean _tmp7_ = FALSE; - GeeCollection* _tmp8_; + ViewCollectionMonitorImpl* _tmp0_; + GeeHashMultiMap* _tmp1_; + ViewCollectionMonitorImpl* _tmp2_; + gboolean _tmp3_ = FALSE; #line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1342,160 +1585,120 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection #line 227 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = sources; -#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = manager; -#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = prereq; + _tmp0_ = view_collection_monitor_impl_new (self, sources, manager, prereq); #line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = view_collection_monitor_impl_new (self, _tmp0_, _tmp1_, _tmp2_); -#line 230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = _tmp3_; -#line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->monitors; + monitor = _tmp0_; #line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = sources; + _tmp1_ = self->priv->monitors; #line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = monitor; + _tmp2_ = monitor; #line 231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp5_, _tmp6_); -#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = initial; + gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap), sources, _tmp2_); #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp8_ != NULL) { -#line 1366 "ViewCollection.c" - GeeCollection* _tmp9_; - gint _tmp10_; - gint _tmp11_; -#line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = initial; + if (initial != NULL) { +#line 1599 "ViewCollection.c" + gint _tmp4_; + gint _tmp5_; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_collection_get_size (_tmp9_); + _tmp4_ = gee_collection_get_size (initial); #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp5_ = _tmp4_; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _tmp11_ > 0; -#line 1378 "ViewCollection.c" + _tmp3_ = _tmp5_ > 0; +#line 1608 "ViewCollection.c" } else { #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = FALSE; -#line 1382 "ViewCollection.c" + _tmp3_ = FALSE; +#line 1612 "ViewCollection.c" } #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 1386 "ViewCollection.c" + if (_tmp3_) { +#line 1616 "ViewCollection.c" GeeArrayList* created_views = NULL; - GeeArrayList* _tmp12_; - GeeArrayList* _tmp24_; - ProgressMonitor _tmp25_; - void* _tmp25__target; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + GeeArrayList* _tmp6_; + GeeArrayList* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - created_views = _tmp12_; -#line 1398 "ViewCollection.c" + created_views = _tmp6_; +#line 1626 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; -#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = initial; + GeeIterator* _tmp7_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (initial, GEE_TYPE_ITERABLE, GeeIterable)); #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp14_; + _source_it = _tmp7_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1411 "ViewCollection.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 1636 "ViewCollection.c" + GeeIterator* _tmp8_; DataSource* source = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - GeeArrayList* _tmp19_; - ViewManager* _tmp20_; - DataSource* _tmp21_; - DataView* _tmp22_; - DataView* _tmp23_; -#line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = _source_it; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GeeArrayList* _tmp11_; + DataSource* _tmp12_; + DataView* _tmp13_; + DataView* _tmp14_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp8_ = _source_it; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp8_)) { #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1430 "ViewCollection.c" +#line 1651 "ViewCollection.c" } #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _source_it; + _tmp9_ = _source_it; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = (DataSource*) _tmp18_; + source = (DataSource*) _tmp10_; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = created_views; + _tmp11_ = created_views; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = manager; -#line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = source; + _tmp12_ = source; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = view_manager_create_view (_tmp20_, _tmp21_); + _tmp13_ = view_manager_create_view (manager, _tmp12_); #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _tmp22_; + _tmp14_ = _tmp13_; #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); #line 237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp14_); #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 1454 "ViewCollection.c" +#line 1673 "ViewCollection.c" } #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 1458 "ViewCollection.c" +#line 1677 "ViewCollection.c" } #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = created_views; + _tmp15_ = created_views; #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = progress_monitor; + _tmp16_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), progress_monitor, progress_monitor_target); #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25__target = progress_monitor_target; + _tmp17_ = _tmp16_; #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_, _tmp25__target); -#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; -#line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp17_); #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); -#line 1474 "ViewCollection.c" +#line 1689 "ViewCollection.c" } else { - SourceCollection* _tmp28_; - SourceCollection* _tmp29_; - GeeCollection* _tmp30_; - GeeIterable* _tmp31_; - ProgressMonitor _tmp32_; - void* _tmp32__target; -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = sources; -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = sources; -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection)); -#line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable); + GeeCollection* _tmp18_; + GeeIterable* _tmp19_; #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = progress_monitor; + _tmp18_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection)); #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32__target = progress_monitor_target; + _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable); #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_sources (self, _tmp28_, _tmp31_, _tmp32_, _tmp32__target); + view_collection_add_sources (self, sources, _tmp19_, progress_monitor, progress_monitor_target); #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp31_); -#line 1498 "ViewCollection.c" + _g_object_unref0 (_tmp19_); +#line 1701 "ViewCollection.c" } #line 245 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); @@ -1503,52 +1706,53 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection result = G_TYPE_CHECK_INSTANCE_CAST (monitor, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor); #line 247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 1506 "ViewCollection.c" +#line 1709 "ViewCollection.c" } -static gpointer _view_collection_monitor_ref0 (gpointer self) { +static gpointer +_view_collection_monitor_ref0 (gpointer self) +{ #line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? view_collection_monitor_ref (self) : NULL; -#line 1513 "ViewCollection.c" +#line 1718 "ViewCollection.c" } -void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m) { +void +view_collection_halt_monitoring (ViewCollection* self, + ViewCollectionMonitor* m) +{ ViewCollectionMonitorImpl* monitor = NULL; - ViewCollectionMonitor* _tmp0_; - ViewCollectionMonitorImpl* _tmp1_; + ViewCollectionMonitorImpl* _tmp0_; gboolean removed = FALSE; - GeeHashMultiMap* _tmp2_; - SourceCollection* _tmp3_; - gboolean _tmp4_; + GeeHashMultiMap* _tmp1_; + SourceCollection* _tmp2_; #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (VIEW_COLLECTION_IS_MONITOR (m)); #line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = m; -#line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _view_collection_monitor_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl)); + _tmp0_ = _view_collection_monitor_ref0 (G_TYPE_CHECK_INSTANCE_CAST (m, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl)); #line 251 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = _tmp1_; + monitor = _tmp0_; #line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->monitors; -#line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = monitor->sources; + _tmp1_ = self->priv->monitors; #line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_multi_map_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp3_, monitor); + _tmp2_ = monitor->sources; #line 253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - removed = _tmp4_; + removed = gee_multi_map_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp2_, monitor); #line 254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (removed, "removed"); #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); -#line 1547 "ViewCollection.c" +#line 1749 "ViewCollection.c" } -void view_collection_halt_all_monitoring (ViewCollection* self) { +void +view_collection_halt_all_monitoring (ViewCollection* self) +{ GeeHashMultiMap* _tmp0_; #line 257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); @@ -1556,49 +1760,59 @@ void view_collection_halt_all_monitoring (ViewCollection* self) { _tmp0_ = self->priv->monitors; #line 258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" gee_multi_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap)); -#line 1559 "ViewCollection.c" +#line 1763 "ViewCollection.c" } -static gpointer _data_collection_ref0 (gpointer self) { +static gpointer +_data_collection_ref0 (gpointer self) +{ #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? data_collection_ref (self) : NULL; -#line 1566 "ViewCollection.c" +#line 1772 "ViewCollection.c" } -static void _view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_view_collection_on_mirror_contents_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_mirror_contents_added ((ViewCollection*) self, added); -#line 1573 "ViewCollection.c" +#line 1783 "ViewCollection.c" } -static void _view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_view_collection_on_mirror_contents_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_mirror_contents_removed ((ViewCollection*) self, removed); -#line 1580 "ViewCollection.c" +#line 1794 "ViewCollection.c" } -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target) { +void +view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target) +{ ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - CreateView _tmp2_; - void* _tmp2__target; - CreateViewPredicate _tmp3_; - void* _tmp3__target; - ViewCollection* _tmp4_; - void* _tmp5_; - Comparator _tmp6_; - ViewCollection* _tmp7_; - void* _tmp8_; - ComparatorPredicate _tmp9_; - ViewCollection* _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; + void* _tmp1_; + Comparator _tmp2_; + void* _tmp3_; + ComparatorPredicate _tmp4_; + ViewCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; #line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 261 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1610,62 +1824,50 @@ void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, Cr #line 265 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = to_mirror; -#line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (to_mirror); #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->priv->mirroring); #line 267 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->mirroring = _tmp1_; -#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = mirroring_ctor; + self->priv->mirroring = _tmp0_; #line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2__target = mirroring_ctor_target; + self->priv->mirroring_ctor = mirroring_ctor; #line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->mirroring_ctor = _tmp2_; -#line 268 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->mirroring_ctor_target = _tmp2__target; -#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = should_mirror; + self->priv->mirroring_ctor_target = mirroring_ctor_target; #line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3__target = should_mirror_target; + self->priv->should_mirror = should_mirror; #line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->should_mirror = _tmp3_; -#line 269 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->should_mirror_target = _tmp3__target; -#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = to_mirror; + self->priv->should_mirror_target = should_mirror_target; #line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = data_collection_get_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), &_tmp5_); + _tmp2_ = data_collection_get_comparator (G_TYPE_CHECK_INSTANCE_CAST (to_mirror, TYPE_DATA_COLLECTION, DataCollection), &_tmp1_); #line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = to_mirror; + _tmp4_ = data_collection_get_comparator_predicate (G_TYPE_CHECK_INSTANCE_CAST (to_mirror, TYPE_DATA_COLLECTION, DataCollection), &_tmp3_); #line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = data_collection_get_comparator_predicate (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), &_tmp8_); -#line 270 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp6_, _tmp5_, _tmp9_, _tmp8_); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp2_, _tmp1_, _tmp4_, _tmp3_); #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = self->priv->mirroring; + _tmp5_ = self->priv->mirroring; #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _tmp11_; + _tmp7_ = _tmp6_; #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_on_mirror_contents_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + view_collection_on_mirror_contents_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 273 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp7_); #line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = self->priv->mirroring; + _tmp8_ = self->priv->mirroring; #line 275 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_mirror_contents_added_data_collection_items_added, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_mirror_contents_added_data_collection_items_added, self); #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = self->priv->mirroring; + _tmp9_ = self->priv->mirroring; #line 276 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self); -#line 1664 "ViewCollection.c" + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self); +#line 1864 "ViewCollection.c" } -void view_collection_halt_mirroring (ViewCollection* self) { +void +view_collection_halt_mirroring (ViewCollection* self) +{ ViewCollection* _tmp0_; #line 279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); @@ -1673,7 +1875,7 @@ void view_collection_halt_mirroring (ViewCollection* self) { _tmp0_ = self->priv->mirroring; #line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_ != NULL) { -#line 1676 "ViewCollection.c" +#line 1878 "ViewCollection.c" ViewCollection* _tmp1_; guint _tmp2_; ViewCollection* _tmp3_; @@ -1690,22 +1892,29 @@ void view_collection_halt_mirroring (ViewCollection* self) { g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); #line 282 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _view_collection_on_mirror_contents_removed_data_collection_items_removed, self); -#line 1693 "ViewCollection.c" +#line 1895 "ViewCollection.c" } #line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->priv->mirroring); #line 285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->mirroring = NULL; -#line 1699 "ViewCollection.c" +#line 1901 "ViewCollection.c" } -void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target) { +void +view_collection_copy_into (ViewCollection* self, + ViewCollection* to_copy, + CreateView copying_ctor, + void* copying_ctor_target, + CreateViewPredicate should_copy, + void* should_copy_target) +{ GeeArrayList* copy_view = NULL; GeeArrayList* _tmp0_; - GeeArrayList* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + GeeArrayList* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1714,148 +1923,128 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C _tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 291 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" copy_view = _tmp0_; -#line 1717 "ViewCollection.c" +#line 1926 "ViewCollection.c" { GeeIterator* _object_it = NULL; - ViewCollection* _tmp1_; + GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; -#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = to_copy; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (to_copy, TYPE_DATA_COLLECTION, DataCollection)); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1741 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1947 "ViewCollection.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; DataView* view = NULL; - DataObject* _tmp10_; - DataView* _tmp11_; - CreateViewPredicate _tmp12_; - void* _tmp12__target; - DataView* _tmp13_; - DataSource* _tmp14_; - DataSource* _tmp15_; - gboolean _tmp16_; - gboolean _tmp17_; -#line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + DataObject* _tmp8_; + DataView* _tmp9_; + DataView* _tmp10_; + DataSource* _tmp11_; + DataSource* _tmp12_; + gboolean _tmp13_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1765 "ViewCollection.c" +#line 1965 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = object; + _tmp8_ = object; #line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); #line 293 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp11_; + view = _tmp9_; #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = should_copy; -#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12__target = should_copy_target; -#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; -#line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = data_view_get_source (_tmp13_); + _tmp10_ = view; #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = _tmp14_; + _tmp11_ = data_view_get_source (_tmp10_); #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = _tmp12_ (_tmp15_, _tmp12__target); + _tmp12_ = _tmp11_; #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp16_; + _tmp13_ = should_copy (_tmp12_, should_copy_target); #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp12_); #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp17_) { -#line 1797 "ViewCollection.c" - GeeArrayList* _tmp18_; - CreateView _tmp19_; - void* _tmp19__target; - DataView* _tmp20_; - DataSource* _tmp21_; - DataSource* _tmp22_; - DataView* _tmp23_; - DataView* _tmp24_; -#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = copy_view; -#line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = copying_ctor; + if (_tmp13_) { +#line 1991 "ViewCollection.c" + GeeArrayList* _tmp14_; + DataView* _tmp15_; + DataSource* _tmp16_; + DataSource* _tmp17_; + DataView* _tmp18_; + DataView* _tmp19_; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19__target = copying_ctor_target; + _tmp14_ = copy_view; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = view; + _tmp15_ = view; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = data_view_get_source (_tmp20_); + _tmp16_ = data_view_get_source (_tmp15_); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _tmp19_ (_tmp22_, _tmp19__target); + _tmp18_ = copying_ctor (_tmp17_, copying_ctor_target); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp19_); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp22_); -#line 1828 "ViewCollection.c" + _g_object_unref0 (_tmp17_); +#line 2016 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 1834 "ViewCollection.c" +#line 2022 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 1838 "ViewCollection.c" +#line 2026 "ViewCollection.c" } #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = copy_view; + _tmp20_ = copy_view; #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp21_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp22_); #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (copy_view); -#line 1850 "ViewCollection.c" +#line 2038 "ViewCollection.c" } -gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f) { +gboolean +view_collection_is_view_filter_installed (ViewCollection* self, + ViewFilter* f) +{ gboolean result = FALSE; GeeSet* _tmp0_; - ViewFilter* _tmp1_; - gboolean _tmp2_; #line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 301 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1863,103 +2052,77 @@ gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFil #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->filters; #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = f; -#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp2_; + result = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f); #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 1873 "ViewCollection.c" +#line 2058 "ViewCollection.c" } -void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) { - ViewFilter* _tmp0_; - gboolean _tmp1_; - GeeSet* _tmp2_; - ViewFilter* _tmp3_; - ViewFilter* _tmp4_; - ViewFilter* _tmp5_; +void +view_collection_install_view_filter (ViewCollection* self, + ViewFilter* f) +{ + GeeSet* _tmp0_; #line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 305 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (f)); #line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = f; -#line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_is_view_filter_installed (self, _tmp0_); -#line 306 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_) { + if (view_collection_is_view_filter_installed (self, f)) { #line 307 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1896 "ViewCollection.c" +#line 2075 "ViewCollection.c" } #line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->filters; -#line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = f; + _tmp0_ = self->priv->filters; #line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); -#line 310 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = f; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f); #line 310 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (_tmp4_, "refresh", (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); + g_signal_connect (f, "refresh", (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); #line 313 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_view_filter_refresh (self); #line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = f; -#line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_view_filter_installed (self, _tmp5_); -#line 1914 "ViewCollection.c" + view_collection_notify_view_filter_installed (self, f); +#line 2087 "ViewCollection.c" } -void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) { - ViewFilter* _tmp0_; - gboolean _tmp1_; - GeeSet* _tmp2_; - ViewFilter* _tmp3_; - ViewFilter* _tmp4_; - guint _tmp5_; - ViewFilter* _tmp6_; +void +view_collection_remove_view_filter (ViewCollection* self, + ViewFilter* f) +{ + GeeSet* _tmp0_; + guint _tmp1_; #line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 319 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (f)); #line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = f; -#line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_is_view_filter_installed (self, _tmp0_); -#line 320 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp1_) { + if (!view_collection_is_view_filter_installed (self, f)) { #line 321 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1938 "ViewCollection.c" +#line 2105 "ViewCollection.c" } #line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->filters; -#line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = f; + _tmp0_ = self->priv->filters; #line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), f); #line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = f; + g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE); #line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp5_, NULL, FALSE); -#line 324 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); + g_signal_handlers_disconnect_matched (f, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _view_collection_on_view_filter_refresh_view_filter_refresh, self); #line 327 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_view_filter_refresh (self); #line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = f; -#line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_view_filter_removed (self, _tmp6_); -#line 1958 "ViewCollection.c" + view_collection_notify_view_filter_removed (self, f); +#line 2119 "ViewCollection.c" } -static void view_collection_on_view_filter_refresh (ViewCollection* self) { +static void +view_collection_on_view_filter_refresh (ViewCollection* self) +{ GeeCollection* _tmp0_; GeeCollection* _tmp1_; #line 333 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1972,17 +2135,20 @@ static void view_collection_on_view_filter_refresh (ViewCollection* self) { view_collection_filter_altered_items (self, _tmp1_); #line 334 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp1_); -#line 1975 "ViewCollection.c" +#line 2138 "ViewCollection.c" } -static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* view) { +static gboolean +view_collection_is_in_filter (ViewCollection* self, + DataView* view) +{ gboolean result = FALSE; #line 338 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 338 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); -#line 1985 "ViewCollection.c" +#line 2151 "ViewCollection.c" { GeeIterator* _f_it = NULL; GeeSet* _tmp0_; @@ -1995,39 +2161,30 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi _f_it = _tmp1_; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1998 "ViewCollection.c" +#line 2164 "ViewCollection.c" GeeIterator* _tmp2_; - gboolean _tmp3_; ViewFilter* f = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - ViewFilter* _tmp6_; - DataView* _tmp7_; - gboolean _tmp8_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + ViewFilter* _tmp5_; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _f_it; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2015 "ViewCollection.c" +#line 2176 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _f_it; + _tmp3_ = _f_it; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - f = (ViewFilter*) _tmp5_; -#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = f; -#line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; + f = (ViewFilter*) _tmp4_; #line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view_filter_predicate (_tmp6_, _tmp7_); + _tmp5_ = f; #line 340 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp8_) { + if (!view_filter_predicate (_tmp5_, view)) { #line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2036,45 +2193,47 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi _g_object_unref0 (_f_it); #line 341 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2039 "ViewCollection.c" +#line 2196 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_filter_unref0 (f); -#line 2043 "ViewCollection.c" +#line 2200 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_f_it); -#line 2047 "ViewCollection.c" +#line 2204 "ViewCollection.c" } #line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 343 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2053 "ViewCollection.c" +#line 2210 "ViewCollection.c" } -static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object) { +static gboolean +view_collection_real_valid_type (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; #line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 346 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; -#line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_VIEW); + result = G_TYPE_CHECK_INSTANCE_TYPE (object, TYPE_DATA_VIEW); #line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2071 "ViewCollection.c" +#line 2228 "ViewCollection.c" } -static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added) { - DataCollection* _tmp0_; - GeeIterable* _tmp1_; +static void +view_collection_on_sources_added (ViewCollection* self, + DataCollection* sources, + GeeIterable* added) +{ #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2082,28 +2241,33 @@ static void view_collection_on_sources_added (ViewCollection* self, DataCollecti #line 350 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = sources; -#line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = added; -#line 351 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_sources (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, NULL, NULL); -#line 2090 "ViewCollection.c" + view_collection_add_sources (self, G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_SOURCE_COLLECTION, SourceCollection), added, NULL, NULL); +#line 2245 "ViewCollection.c" } -static DataView* _view_manager_create_view_create_view (DataSource* source, gpointer self) { +static DataView* +_view_manager_create_view_create_view (DataSource* source, + gpointer self) +{ DataView* result; result = view_manager_create_view ((ViewManager*) self, source); #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2099 "ViewCollection.c" +#line 2257 "ViewCollection.c" } -static void view_collection_add_sources (ViewCollection* self, SourceCollection* sources, GeeIterable* added, ProgressMonitor progress_monitor, void* progress_monitor_target) { +static void +view_collection_add_sources (ViewCollection* self, + SourceCollection* sources, + GeeIterable* added, + ProgressMonitor progress_monitor, + void* progress_monitor_target) +{ DataView* created_view = NULL; GeeArrayList* created_views = NULL; - DataView* _tmp37_; + DataView* _tmp32_; #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2114,122 +2278,107 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* created_view = NULL; #line 359 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" created_views = NULL; -#line 2117 "ViewCollection.c" +#line 2281 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = added; + GeeIterator* _tmp0_; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (added); #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2130 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2291 "ViewCollection.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; CreateView factory = NULL; void* factory_target; GDestroyNotify factory_target_destroy_notify; - CreateView _tmp22_; - void* _tmp22__target; -#line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _source_it; + CreateView _tmp17_; + void* _tmp17__target; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2149 "ViewCollection.c" +#line 2307 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory = NULL; #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory_target = NULL; #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory_target_destroy_notify = NULL; -#line 2163 "ViewCollection.c" +#line 2321 "ViewCollection.c" { GeeIterator* _monitor_it = NULL; - GeeHashMultiMap* _tmp6_; - SourceCollection* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; -#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = self->priv->monitors; + GeeHashMultiMap* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = sources; + _tmp4_ = self->priv->monitors; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp7_); + _tmp5_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), sources); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _monitor_it = _tmp11_; + _monitor_it = _tmp8_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2190 "ViewCollection.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 2345 "ViewCollection.c" + GeeIterator* _tmp9_; ViewCollectionMonitorImpl* monitor = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - ViewCollectionMonitorImpl* _tmp16_; - ViewManager* _tmp17_; - DataSource* _tmp18_; - gboolean _tmp19_; + GeeIterator* _tmp10_; + gpointer _tmp11_; + ViewCollectionMonitorImpl* _tmp12_; + ViewManager* _tmp13_; + DataSource* _tmp14_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _monitor_it; + _tmp9_ = _monitor_it; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = gee_iterator_next (_tmp12_); -#line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp9_)) { #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2208 "ViewCollection.c" +#line 2359 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _monitor_it; + _tmp10_ = _monitor_it; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = (ViewCollectionMonitorImpl*) _tmp15_; -#line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = monitor; + monitor = (ViewCollectionMonitorImpl*) _tmp11_; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp16_->manager; + _tmp12_ = monitor; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = source; + _tmp13_ = _tmp12_->manager; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = view_manager_include_in_view (_tmp17_, _tmp18_); + _tmp14_ = source; #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp19_) { -#line 2226 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp20_; - ViewManager* _tmp21_; + if (view_manager_include_in_view (_tmp13_, _tmp14_)) { +#line 2375 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp15_; + ViewManager* _tmp16_; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = monitor; + _tmp15_ = monitor; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = _tmp20_->manager; + _tmp16_ = _tmp15_->manager; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" (factory_target_destroy_notify == NULL) ? NULL : (factory_target_destroy_notify (factory_target), NULL); #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2241,112 +2390,112 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory = _view_manager_create_view_create_view; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - factory_target = view_manager_ref (_tmp21_); + factory_target = view_manager_ref (_tmp16_); #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory_target_destroy_notify = view_manager_unref; #line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); #line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2251 "ViewCollection.c" +#line 2400 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); -#line 2255 "ViewCollection.c" +#line 2404 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_monitor_it); -#line 2259 "ViewCollection.c" +#line 2408 "ViewCollection.c" } #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = factory; + _tmp17_ = factory; #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22__target = factory_target; + _tmp17__target = factory_target; #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_ != NULL) { -#line 2267 "ViewCollection.c" + if (_tmp17_ != NULL) { +#line 2416 "ViewCollection.c" DataView* new_view = NULL; - CreateView _tmp23_; - void* _tmp23__target; - DataSource* _tmp24_; - DataView* _tmp25_; - GeeArrayList* _tmp26_; + CreateView _tmp18_; + void* _tmp18__target; + DataSource* _tmp19_; + DataView* _tmp20_; + GeeArrayList* _tmp21_; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = factory; + _tmp18_ = factory; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23__target = factory_target; + _tmp18__target = factory_target; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = source; + _tmp19_ = source; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = _tmp23_ (_tmp24_, _tmp23__target); + _tmp20_ = _tmp18_ (_tmp19_, _tmp18__target); #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - new_view = _tmp25_; + new_view = _tmp20_; #line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = created_views; + _tmp21_ = created_views; #line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp26_ != NULL) { -#line 2288 "ViewCollection.c" - GeeArrayList* _tmp27_; - DataView* _tmp28_; + if (_tmp21_ != NULL) { +#line 2437 "ViewCollection.c" + GeeArrayList* _tmp22_; + DataView* _tmp23_; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = created_views; + _tmp22_ = created_views; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = new_view; + _tmp23_ = new_view; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); -#line 2297 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); +#line 2446 "ViewCollection.c" } else { - DataView* _tmp29_; + DataView* _tmp24_; #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = created_view; + _tmp24_ = created_view; #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp29_ == NULL) { -#line 2304 "ViewCollection.c" - DataView* _tmp30_; - DataView* _tmp31_; + if (_tmp24_ == NULL) { +#line 2453 "ViewCollection.c" + DataView* _tmp25_; + DataView* _tmp26_; #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = new_view; + _tmp25_ = new_view; #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = _g_object_ref0 (_tmp30_); + _tmp26_ = _g_object_ref0 (_tmp25_); #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_view); #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - created_view = _tmp31_; -#line 2315 "ViewCollection.c" + created_view = _tmp26_; +#line 2464 "ViewCollection.c" } else { - GeeArrayList* _tmp32_; - GeeArrayList* _tmp33_; - DataView* _tmp34_; - GeeArrayList* _tmp35_; - DataView* _tmp36_; + GeeArrayList* _tmp27_; + GeeArrayList* _tmp28_; + DataView* _tmp29_; + GeeArrayList* _tmp30_; + DataView* _tmp31_; #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - created_views = _tmp32_; + created_views = _tmp27_; #line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = created_views; + _tmp28_ = created_views; #line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = created_view; + _tmp29_ = created_view; #line 381 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp34_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); #line 382 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_view); #line 382 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" created_view = NULL; #line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = created_views; + _tmp30_ = created_views; #line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = new_view; + _tmp31_ = new_view; #line 383 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); -#line 2344 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); +#line 2493 "ViewCollection.c" } } #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (new_view); -#line 2349 "ViewCollection.c" +#line 2498 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" (factory_target_destroy_notify == NULL) ? NULL : (factory_target_destroy_notify (factory_target), NULL); @@ -2358,346 +2507,319 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* factory_target_destroy_notify = NULL; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 2361 "ViewCollection.c" +#line 2510 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 2365 "ViewCollection.c" +#line 2514 "ViewCollection.c" } #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = created_view; + _tmp32_ = created_view; #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp37_ != NULL) { -#line 2371 "ViewCollection.c" - DataView* _tmp38_; + if (_tmp32_ != NULL) { +#line 2520 "ViewCollection.c" + DataView* _tmp33_; #line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp38_ = created_view; + _tmp33_ = created_view; #line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject)); -#line 2377 "ViewCollection.c" + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); +#line 2526 "ViewCollection.c" } else { - gboolean _tmp39_ = FALSE; - GeeArrayList* _tmp40_; + gboolean _tmp34_ = FALSE; + GeeArrayList* _tmp35_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = created_views; + _tmp35_ = created_views; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp40_ != NULL) { -#line 2385 "ViewCollection.c" - GeeArrayList* _tmp41_; - gint _tmp42_; - gint _tmp43_; + if (_tmp35_ != NULL) { +#line 2534 "ViewCollection.c" + GeeArrayList* _tmp36_; + gint _tmp37_; + gint _tmp38_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp41_ = created_views; + _tmp36_ = created_views; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp43_ = _tmp42_; + _tmp38_ = _tmp37_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = _tmp43_ > 0; -#line 2397 "ViewCollection.c" + _tmp34_ = _tmp38_ > 0; +#line 2546 "ViewCollection.c" } else { #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = FALSE; -#line 2401 "ViewCollection.c" + _tmp34_ = FALSE; +#line 2550 "ViewCollection.c" } #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp39_) { -#line 2405 "ViewCollection.c" - GeeArrayList* _tmp44_; - ProgressMonitor _tmp45_; - void* _tmp45__target; - GeeCollection* _tmp46_; - GeeCollection* _tmp47_; -#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp44_ = created_views; -#line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp45_ = progress_monitor; + if (_tmp34_) { +#line 2554 "ViewCollection.c" + GeeArrayList* _tmp39_; + GeeCollection* _tmp40_; + GeeCollection* _tmp41_; #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp45__target = progress_monitor_target; + _tmp39_ = created_views; #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp46_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_, _tmp45__target); + _tmp40_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), progress_monitor, progress_monitor_target); #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp47_ = _tmp46_; + _tmp41_ = _tmp40_; #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp47_); -#line 2423 "ViewCollection.c" + _g_object_unref0 (_tmp41_); +#line 2566 "ViewCollection.c" } } #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); #line 354 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_view); -#line 2430 "ViewCollection.c" +#line 2573 "ViewCollection.c" } -static gboolean view_collection_real_add (DataCollection* base, DataObject* object) { +static gboolean +view_collection_real_add (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; - DataObject* _tmp1_; - gboolean _tmp2_; - DataObject* _tmp3_; - GeeCollection* _tmp4_; - GeeCollection* _tmp5_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 394 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 395 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; -#line 395 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView), TRUE); -#line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = object; -#line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_); + data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView), TRUE); #line 397 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp2_) { + if (!DATA_COLLECTION_CLASS (view_collection_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object)) { #line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2461 "ViewCollection.c" +#line 2597 "ViewCollection.c" } #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = object; -#line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = data_collection_get_singleton (_tmp3_); + _tmp0_ = data_collection_get_singleton (object); #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_filter_altered_items (self, _tmp5_); + view_collection_filter_altered_items (self, _tmp1_); #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp1_); #line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2477 "ViewCollection.c" +#line 2611 "ViewCollection.c" } -static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) { +static GeeCollection* +view_collection_real_add_many (DataCollection* base, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target) +{ ViewCollection * self; GeeCollection* result = NULL; GeeCollection* return_list = NULL; - GeeCollection* _tmp7_; - ProgressMonitor _tmp8_; - void* _tmp8__target; - GeeCollection* _tmp9_; + GeeCollection* _tmp5_; #line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 405 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL); -#line 2493 "ViewCollection.c" +#line 2629 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = objects; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (objects, GEE_TYPE_ITERABLE, GeeIterable)); #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2506 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2639 "ViewCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataObject* _tmp6_; -#line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataObject* _tmp4_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2521 "ViewCollection.c" +#line 2651 "ViewCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 408 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 408 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView), TRUE); + data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView), TRUE); #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 2535 "ViewCollection.c" +#line 2665 "ViewCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 2539 "ViewCollection.c" +#line 2669 "ViewCollection.c" } #line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = objects; + _tmp5_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), objects, monitor, monitor_target); #line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = monitor; -#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8__target = monitor_target; -#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp8_, _tmp8__target); -#line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - return_list = _tmp9_; + return_list = _tmp5_; #line 412 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_filter_altered_items (self, G_TYPE_CHECK_INSTANCE_CAST (return_list, GEE_TYPE_COLLECTION, GeeCollection)); #line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = return_list; #line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2557 "ViewCollection.c" +#line 2681 "ViewCollection.c" } -static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed) { +static void +view_collection_on_sources_removed (ViewCollection* self, + GeeIterable* removed) +{ Marker* marker = NULL; - gboolean _tmp14_ = FALSE; - Marker* _tmp15_; + gboolean _tmp12_ = FALSE; + Marker* _tmp13_; #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 419 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" marker = NULL; -#line 2571 "ViewCollection.c" +#line 2698 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = removed; + _tmp0_ = gee_iterable_iterator (removed); #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp1_; + _source_it = _tmp0_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2584 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2708 "ViewCollection.c" + GeeIterator* _tmp1_; DataSource* source = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataView* view = NULL; - GeeHashMap* _tmp6_; - DataSource* _tmp7_; - gpointer _tmp8_; - DataView* _tmp9_; -#line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _source_it; + GeeHashMap* _tmp4_; + DataSource* _tmp5_; + gpointer _tmp6_; + DataView* _tmp7_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _source_it; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2603 "ViewCollection.c" +#line 2724 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _source_it; + _tmp2_ = _source_it; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = (DataSource*) _tmp5_; + source = (DataSource*) _tmp3_; #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = self->priv->source_map; + _tmp4_ = self->priv->source_map; #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = source; + _tmp5_ = source; #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_); + _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 421 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp8_; + view = (DataView*) _tmp6_; #line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp7_ = view; #line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp9_ != NULL) { -#line 2623 "ViewCollection.c" + if (_tmp7_ != NULL) { +#line 2744 "ViewCollection.c" + Marker* _tmp8_; Marker* _tmp10_; - Marker* _tmp12_; - DataView* _tmp13_; + DataView* _tmp11_; #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = marker; + _tmp8_ = marker; #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { -#line 2631 "ViewCollection.c" - Marker* _tmp11_; + if (_tmp8_ == NULL) { +#line 2752 "ViewCollection.c" + Marker* _tmp9_; #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + _tmp9_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); #line 426 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker = _tmp11_; -#line 2639 "ViewCollection.c" + marker = _tmp9_; +#line 2760 "ViewCollection.c" } #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = marker; + _tmp10_ = marker; #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp11_ = view; #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); -#line 2647 "ViewCollection.c" + marker_mark (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); +#line 2768 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 2653 "ViewCollection.c" +#line 2774 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 2657 "ViewCollection.c" +#line 2778 "ViewCollection.c" } #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = marker; -#line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_ != NULL) { -#line 2663 "ViewCollection.c" - Marker* _tmp16_; - gint _tmp17_; + _tmp13_ = marker; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = marker; + if (_tmp13_ != NULL) { +#line 2784 "ViewCollection.c" + Marker* _tmp14_; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = marker_get_count (_tmp16_); + _tmp14_ = marker; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _tmp17_ != 0; -#line 2672 "ViewCollection.c" + _tmp12_ = marker_get_count (_tmp14_) != 0; +#line 2790 "ViewCollection.c" } else { #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = FALSE; -#line 2676 "ViewCollection.c" + _tmp12_ = FALSE; +#line 2794 "ViewCollection.c" } #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp14_) { -#line 2680 "ViewCollection.c" - Marker* _tmp18_; + if (_tmp12_) { +#line 2798 "ViewCollection.c" + Marker* _tmp15_; #line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = marker; + _tmp15_ = marker; #line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp18_); -#line 2686 "ViewCollection.c" + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp15_); +#line 2804 "ViewCollection.c" } #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 2690 "ViewCollection.c" +#line 2808 "ViewCollection.c" } -static void view_collection_on_sources_altered (ViewCollection* self, DataCollection* collection, GeeMap* items) { +static void +view_collection_on_sources_altered (ViewCollection* self, + DataCollection* collection, + GeeMap* items) +{ GeeArrayList* to_add = NULL; GeeArrayList* to_remove = NULL; gboolean ordering_changed = FALSE; - GeeArrayList* _tmp82_; - GeeArrayList* _tmp86_; - gboolean _tmp90_; + GeeArrayList* _tmp69_; + GeeArrayList* _tmp73_; + gboolean _tmp77_; #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2710,223 +2832,202 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec to_remove = NULL; #line 441 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ordering_changed = FALSE; -#line 2713 "ViewCollection.c" +#line 2835 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_keys (items); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _tmp1_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; -#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2740 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 2859 "ViewCollection.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Alteration* alteration = NULL; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; + DataObject* _tmp8_; + gpointer _tmp9_; DataSource* source = NULL; - DataObject* _tmp13_; - DataSource* _tmp14_; + DataObject* _tmp10_; + DataSource* _tmp11_; ViewCollectionMonitorImpl* monitor = NULL; gboolean ignored = FALSE; - gboolean _tmp38_; - gboolean _tmp40_ = FALSE; - ViewCollectionMonitorImpl* _tmp41_; -#line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + gboolean _tmp31_; + gboolean _tmp33_ = FALSE; + ViewCollectionMonitorImpl* _tmp34_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2766 "ViewCollection.c" +#line 2881 "ViewCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp9_; -#line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = items; + object = (DataObject*) _tmp7_; #line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = object; + _tmp8_ = object; #line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (items, _tmp8_); #line 443 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - alteration = (Alteration*) _tmp12_; + alteration = (Alteration*) _tmp9_; #line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = object; + _tmp10_ = object; #line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource)); + _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource)); #line 444 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = _tmp14_; + source = _tmp11_; #line 446 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" monitor = NULL; #line 447 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ignored = TRUE; -#line 2792 "ViewCollection.c" +#line 2905 "ViewCollection.c" { GeeIterator* _monitor_impl_it = NULL; - GeeHashMultiMap* _tmp15_; - DataCollection* _tmp16_; - GeeCollection* _tmp17_; - GeeCollection* _tmp18_; - GeeIterator* _tmp19_; - GeeIterator* _tmp20_; -#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = self->priv->monitors; + GeeHashMultiMap* _tmp12_; + GeeCollection* _tmp13_; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; + GeeIterator* _tmp16_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = collection; + _tmp12_ = self->priv->monitors; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_MULTI_MAP, GeeMultiMap), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_SOURCE_COLLECTION, SourceCollection)); + _tmp13_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MULTI_MAP, GeeMultiMap), G_TYPE_CHECK_INSTANCE_CAST (collection, TYPE_SOURCE_COLLECTION, SourceCollection)); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp14_); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _monitor_impl_it = _tmp20_; + _monitor_impl_it = _tmp16_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2819 "ViewCollection.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 2929 "ViewCollection.c" + GeeIterator* _tmp17_; ViewCollectionMonitorImpl* monitor_impl = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; - gboolean _tmp25_ = FALSE; + GeeIterator* _tmp18_; + gpointer _tmp19_; + gboolean _tmp20_ = FALSE; + ViewCollectionMonitorImpl* _tmp21_; + Alteration* _tmp22_; ViewCollectionMonitorImpl* _tmp26_; - Alteration* _tmp27_; - ViewCollectionMonitorImpl* _tmp32_; - ViewManager* _tmp33_; - DataSource* _tmp34_; - gboolean _tmp35_; + ViewManager* _tmp27_; + DataSource* _tmp28_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = _monitor_impl_it; + _tmp17_ = _monitor_impl_it; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = gee_iterator_next (_tmp21_); -#line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp17_)) { #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2840 "ViewCollection.c" +#line 2946 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = _monitor_impl_it; + _tmp18_ = _monitor_impl_it; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor_impl = (ViewCollectionMonitorImpl*) _tmp24_; + monitor_impl = (ViewCollectionMonitorImpl*) _tmp19_; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = monitor_impl; -#line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_->prereq; + _tmp21_ = monitor_impl; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp27_ != NULL) { -#line 2854 "ViewCollection.c" - Alteration* _tmp28_; - ViewCollectionMonitorImpl* _tmp29_; - Alteration* _tmp30_; - gboolean _tmp31_; + _tmp22_ = _tmp21_->prereq; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = alteration; + if (_tmp22_ != NULL) { +#line 2960 "ViewCollection.c" + Alteration* _tmp23_; + ViewCollectionMonitorImpl* _tmp24_; + Alteration* _tmp25_; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = monitor_impl; + _tmp23_ = alteration; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = _tmp29_->prereq; + _tmp24_ = monitor_impl; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = alteration_contains_any (_tmp28_, _tmp30_); + _tmp25_ = _tmp24_->prereq; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = !_tmp31_; -#line 2869 "ViewCollection.c" + _tmp20_ = !alteration_contains_any (_tmp23_, _tmp25_); +#line 2972 "ViewCollection.c" } else { #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = FALSE; -#line 2873 "ViewCollection.c" + _tmp20_ = FALSE; +#line 2976 "ViewCollection.c" } #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp25_) { + if (_tmp20_) { #line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor_impl); #line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" continue; -#line 2881 "ViewCollection.c" +#line 2984 "ViewCollection.c" } #line 452 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ignored = FALSE; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = monitor_impl; -#line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = _tmp32_->manager; + _tmp26_ = monitor_impl; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = source; + _tmp27_ = _tmp26_->manager; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = view_manager_include_in_view (_tmp33_, _tmp34_); + _tmp28_ = source; #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp35_) { -#line 2895 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp36_; - ViewCollectionMonitorImpl* _tmp37_; + if (view_manager_include_in_view (_tmp27_, _tmp28_)) { +#line 2996 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp29_; + ViewCollectionMonitorImpl* _tmp30_; #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = monitor_impl; + _tmp29_ = monitor_impl; #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = _view_collection_monitor_ref0 (_tmp36_); + _tmp30_ = _view_collection_monitor_ref0 (_tmp29_); #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - monitor = _tmp37_; + monitor = _tmp30_; #line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor_impl); #line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2910 "ViewCollection.c" +#line 3011 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor_impl); -#line 2914 "ViewCollection.c" +#line 3015 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_monitor_impl_it); -#line 2918 "ViewCollection.c" +#line 3019 "ViewCollection.c" } #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp38_ = ignored; + _tmp31_ = ignored; #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp38_) { -#line 2924 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp39_; + if (_tmp31_) { +#line 3025 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp32_; #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = monitor; + _tmp32_ = monitor; #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp39_ == NULL, "monitor == null"); + _vala_assert (_tmp32_ == NULL, "monitor == null"); #line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); #line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2937,230 +3038,212 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _g_object_unref0 (object); #line 464 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" continue; -#line 2940 "ViewCollection.c" +#line 3041 "ViewCollection.c" } #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp41_ = monitor; -#line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp41_ != NULL) { -#line 2946 "ViewCollection.c" - DataSource* _tmp42_; - gboolean _tmp43_; + _tmp34_ = monitor; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp42_ = source; + if (_tmp34_ != NULL) { +#line 3047 "ViewCollection.c" + DataSource* _tmp35_; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp43_ = view_collection_has_view_for_source (self, _tmp42_); + _tmp35_ = source; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = !_tmp43_; -#line 2955 "ViewCollection.c" + _tmp33_ = !view_collection_has_view_for_source (self, _tmp35_); +#line 3053 "ViewCollection.c" } else { #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = FALSE; -#line 2959 "ViewCollection.c" + _tmp33_ = FALSE; +#line 3057 "ViewCollection.c" } #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp40_) { -#line 2963 "ViewCollection.c" - GeeArrayList* _tmp44_; - GeeArrayList* _tmp46_; - ViewCollectionMonitorImpl* _tmp47_; - ViewManager* _tmp48_; - DataSource* _tmp49_; - DataView* _tmp50_; - DataView* _tmp51_; + if (_tmp33_) { +#line 3061 "ViewCollection.c" + GeeArrayList* _tmp36_; + GeeArrayList* _tmp38_; + ViewCollectionMonitorImpl* _tmp39_; + ViewManager* _tmp40_; + DataSource* _tmp41_; + DataView* _tmp42_; + DataView* _tmp43_; #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp44_ = to_add; + _tmp36_ = to_add; #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp44_ == NULL) { -#line 2975 "ViewCollection.c" - GeeArrayList* _tmp45_; + if (_tmp36_ == NULL) { +#line 3073 "ViewCollection.c" + GeeArrayList* _tmp37_; #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp45_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp37_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_add = _tmp45_; -#line 2983 "ViewCollection.c" + to_add = _tmp37_; +#line 3081 "ViewCollection.c" } #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp46_ = to_add; + _tmp38_ = to_add; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp47_ = monitor; + _tmp39_ = monitor; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp48_ = _tmp47_->manager; + _tmp40_ = _tmp39_->manager; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp49_ = source; + _tmp41_ = source; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp50_ = view_manager_create_view (_tmp48_, _tmp49_); + _tmp42_ = view_manager_create_view (_tmp40_, _tmp41_); #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp51_ = _tmp50_; + _tmp43_ = _tmp42_; #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp43_); #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp51_); -#line 3001 "ViewCollection.c" + _g_object_unref0 (_tmp43_); +#line 3099 "ViewCollection.c" } else { - gboolean _tmp52_ = FALSE; - ViewCollectionMonitorImpl* _tmp53_; + gboolean _tmp44_ = FALSE; + ViewCollectionMonitorImpl* _tmp45_; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp53_ = monitor; + _tmp45_ = monitor; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp53_ == NULL) { -#line 3009 "ViewCollection.c" - DataSource* _tmp54_; - gboolean _tmp55_; + if (_tmp45_ == NULL) { +#line 3107 "ViewCollection.c" + DataSource* _tmp46_; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp54_ = source; + _tmp46_ = source; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp55_ = view_collection_has_view_for_source (self, _tmp54_); -#line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp52_ = _tmp55_; -#line 3018 "ViewCollection.c" + _tmp44_ = view_collection_has_view_for_source (self, _tmp46_); +#line 3113 "ViewCollection.c" } else { #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp52_ = FALSE; -#line 3022 "ViewCollection.c" + _tmp44_ = FALSE; +#line 3117 "ViewCollection.c" } #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp52_) { -#line 3026 "ViewCollection.c" - GeeArrayList* _tmp56_; - GeeArrayList* _tmp58_; - DataSource* _tmp59_; - DataView* _tmp60_; - DataView* _tmp61_; + if (_tmp44_) { +#line 3121 "ViewCollection.c" + GeeArrayList* _tmp47_; + GeeArrayList* _tmp49_; + DataSource* _tmp50_; + DataView* _tmp51_; + DataView* _tmp52_; #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp56_ = to_remove; + _tmp47_ = to_remove; #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp56_ == NULL) { -#line 3036 "ViewCollection.c" - GeeArrayList* _tmp57_; + if (_tmp47_ == NULL) { +#line 3131 "ViewCollection.c" + GeeArrayList* _tmp48_; #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp57_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp48_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_remove); #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_remove = _tmp57_; -#line 3044 "ViewCollection.c" + to_remove = _tmp48_; +#line 3139 "ViewCollection.c" } #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp58_ = to_remove; + _tmp49_ = to_remove; #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp59_ = source; + _tmp50_ = source; #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp60_ = view_collection_get_view_for_source (self, _tmp59_); + _tmp51_ = view_collection_get_view_for_source (self, _tmp50_); #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp61_ = _tmp60_; + _tmp52_ = _tmp51_; #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp61_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp52_); #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp61_); -#line 3058 "ViewCollection.c" + _g_object_unref0 (_tmp52_); +#line 3153 "ViewCollection.c" } else { - gboolean _tmp62_ = FALSE; - ViewCollectionMonitorImpl* _tmp63_; -#line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp63_ = monitor; + gboolean _tmp53_ = FALSE; + ViewCollectionMonitorImpl* _tmp54_; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp63_ != NULL) { -#line 3066 "ViewCollection.c" - DataSource* _tmp64_; - gboolean _tmp65_; + _tmp54_ = monitor; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp64_ = source; + if (_tmp54_ != NULL) { +#line 3161 "ViewCollection.c" + DataSource* _tmp55_; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp65_ = view_collection_has_view_for_source (self, _tmp64_); + _tmp55_ = source; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp62_ = _tmp65_; -#line 3075 "ViewCollection.c" + _tmp53_ = view_collection_has_view_for_source (self, _tmp55_); +#line 3167 "ViewCollection.c" } else { #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp62_ = FALSE; -#line 3079 "ViewCollection.c" + _tmp53_ = FALSE; +#line 3171 "ViewCollection.c" } #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp62_) { -#line 3083 "ViewCollection.c" + if (_tmp53_) { +#line 3175 "ViewCollection.c" DataView* view = NULL; - DataSource* _tmp66_; - DataView* _tmp67_; - DataSet* _tmp68_; - DataView* _tmp69_; - gboolean _tmp70_; - gboolean _tmp74_ = FALSE; - DataSet* _tmp75_; + DataSource* _tmp56_; + DataView* _tmp57_; + DataSet* _tmp58_; + DataView* _tmp59_; + gboolean _tmp63_ = FALSE; + DataSet* _tmp64_; #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp66_ = source; + _tmp56_ = source; #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp67_ = view_collection_get_view_for_source (self, _tmp66_); + _tmp57_ = view_collection_get_view_for_source (self, _tmp56_); #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp67_; -#line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp68_ = self->priv->selected; + view = _tmp57_; #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp69_ = view; + _tmp58_ = self->priv->selected; #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp70_ = data_set_contains (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_DATA_OBJECT, DataObject)); + _tmp59_ = view; #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp70_) { -#line 3106 "ViewCollection.c" - DataSet* _tmp71_; - DataView* _tmp72_; - Alteration* _tmp73_; + if (data_set_contains (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_DATA_OBJECT, DataObject))) { +#line 3195 "ViewCollection.c" + DataSet* _tmp60_; + DataView* _tmp61_; + Alteration* _tmp62_; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp71_ = self->priv->selected; + _tmp60_ = self->priv->selected; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp72_ = view; + _tmp61_ = view; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp73_ = alteration; + _tmp62_ = alteration; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_set_resort_object (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_OBJECT, DataObject), _tmp73_); -#line 3118 "ViewCollection.c" + data_set_resort_object (_tmp60_, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_OBJECT, DataObject), _tmp62_); +#line 3207 "ViewCollection.c" } #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp75_ = self->priv->visible; + _tmp64_ = self->priv->visible; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp75_ != NULL) { -#line 3124 "ViewCollection.c" - DataView* _tmp76_; - gboolean _tmp77_; + if (_tmp64_ != NULL) { +#line 3213 "ViewCollection.c" + DataView* _tmp65_; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp76_ = view; + _tmp65_ = view; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp77_ = view_collection_is_visible (self, _tmp76_); -#line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp74_ = _tmp77_; -#line 3133 "ViewCollection.c" + _tmp63_ = view_collection_is_visible (self, _tmp65_); +#line 3219 "ViewCollection.c" } else { #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp74_ = FALSE; -#line 3137 "ViewCollection.c" + _tmp63_ = FALSE; +#line 3223 "ViewCollection.c" } #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp74_) { -#line 3141 "ViewCollection.c" - DataSet* _tmp78_; - DataView* _tmp79_; - Alteration* _tmp80_; - gboolean _tmp81_; -#line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp78_ = self->priv->visible; + if (_tmp63_) { +#line 3227 "ViewCollection.c" + DataSet* _tmp66_; + DataView* _tmp67_; + Alteration* _tmp68_; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp79_ = view; + _tmp66_ = self->priv->visible; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp80_ = alteration; + _tmp67_ = view; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp81_ = data_set_resort_object (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_DATA_OBJECT, DataObject), _tmp80_); + _tmp68_ = alteration; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp81_) { + if (data_set_resort_object (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_DATA_OBJECT, DataObject), _tmp68_)) { #line 485 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ordering_changed = TRUE; -#line 3158 "ViewCollection.c" +#line 3241 "ViewCollection.c" } } #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 3163 "ViewCollection.c" +#line 3246 "ViewCollection.c" } } } @@ -3172,72 +3255,75 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _alteration_unref0 (alteration); #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3175 "ViewCollection.c" +#line 3258 "ViewCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3179 "ViewCollection.c" +#line 3262 "ViewCollection.c" } #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp82_ = to_add; + _tmp69_ = to_add; #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp82_ != NULL) { -#line 3185 "ViewCollection.c" - GeeArrayList* _tmp83_; - GeeCollection* _tmp84_; - GeeCollection* _tmp85_; + if (_tmp69_ != NULL) { +#line 3268 "ViewCollection.c" + GeeArrayList* _tmp70_; + GeeCollection* _tmp71_; + GeeCollection* _tmp72_; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp83_ = to_add; + _tmp70_ = to_add; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp84_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp71_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp85_ = _tmp84_; + _tmp72_ = _tmp71_; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp85_); -#line 3197 "ViewCollection.c" + _g_object_unref0 (_tmp72_); +#line 3280 "ViewCollection.c" } #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp86_ = to_remove; + _tmp73_ = to_remove; #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp86_ != NULL) { -#line 3203 "ViewCollection.c" - GeeArrayList* _tmp87_; - Marker* _tmp88_; - Marker* _tmp89_; + if (_tmp73_ != NULL) { +#line 3286 "ViewCollection.c" + GeeArrayList* _tmp74_; + Marker* _tmp75_; + Marker* _tmp76_; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp87_ = to_remove; + _tmp74_ = to_remove; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp88_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp75_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection)); #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp89_ = _tmp88_; + _tmp76_ = _tmp75_; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp89_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp76_); #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp89_); -#line 3217 "ViewCollection.c" + _g_object_unref0 (_tmp76_); +#line 3300 "ViewCollection.c" } #line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp90_ = ordering_changed; + _tmp77_ = ordering_changed; #line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp90_) { + if (_tmp77_) { #line 497 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_collection_notify_ordering_changed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 3225 "ViewCollection.c" +#line 3308 "ViewCollection.c" } #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_remove); #line 436 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); -#line 3231 "ViewCollection.c" +#line 3314 "ViewCollection.c" } -static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added) { +static void +view_collection_on_mirror_contents_added (ViewCollection* self, + GeeIterable* added) +{ GeeArrayList* to_add = NULL; GeeArrayList* _tmp0_; - GeeArrayList* _tmp19_; - gint _tmp20_; - gint _tmp21_; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3246,148 +3332,142 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 501 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" to_add = _tmp0_; -#line 3249 "ViewCollection.c" +#line 3335 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = added; + GeeIterator* _tmp1_; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp1_ = gee_iterable_iterator (added); #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3262 "ViewCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3345 "ViewCollection.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; DataSource* source = NULL; - DataObject* _tmp7_; - DataSource* _tmp8_; - gboolean _tmp9_ = FALSE; - CreateViewPredicate _tmp10_; - void* _tmp10__target; -#line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _object_it; + DataObject* _tmp5_; + DataSource* _tmp6_; + gboolean _tmp7_ = FALSE; + CreateViewPredicate _tmp8_; + void* _tmp8__target; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3282 "ViewCollection.c" +#line 3362 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); + _tmp6_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView)); #line 503 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = _tmp8_; + source = _tmp6_; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = self->priv->should_mirror; + _tmp8_ = self->priv->should_mirror; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10__target = self->priv->should_mirror_target; + _tmp8__target = self->priv->should_mirror_target; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { + if (_tmp8_ == NULL) { #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = TRUE; -#line 3304 "ViewCollection.c" + _tmp7_ = TRUE; +#line 3384 "ViewCollection.c" } else { - CreateViewPredicate _tmp11_; - void* _tmp11__target; - DataSource* _tmp12_; - gboolean _tmp13_; -#line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = self->priv->should_mirror; + CreateViewPredicate _tmp9_; + void* _tmp9__target; + DataSource* _tmp10_; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11__target = self->priv->should_mirror_target; + _tmp9_ = self->priv->should_mirror; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = source; + _tmp9__target = self->priv->should_mirror_target; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp11_ (_tmp12_, _tmp11__target); + _tmp10_ = source; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp13_; -#line 3320 "ViewCollection.c" + _tmp7_ = _tmp9_ (_tmp10_, _tmp9__target); +#line 3397 "ViewCollection.c" } #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp9_) { -#line 3324 "ViewCollection.c" - GeeArrayList* _tmp14_; - CreateView _tmp15_; - void* _tmp15__target; - DataSource* _tmp16_; - DataView* _tmp17_; - DataView* _tmp18_; + if (_tmp7_) { +#line 3401 "ViewCollection.c" + GeeArrayList* _tmp11_; + CreateView _tmp12_; + void* _tmp12__target; + DataSource* _tmp13_; + DataView* _tmp14_; + DataView* _tmp15_; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = to_add; + _tmp11_ = to_add; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = self->priv->mirroring_ctor; + _tmp12_ = self->priv->mirroring_ctor; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15__target = self->priv->mirroring_ctor_target; + _tmp12__target = self->priv->mirroring_ctor_target; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = source; + _tmp13_ = source; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp15_ (_tmp16_, _tmp15__target); + _tmp14_ = _tmp12_ (_tmp13_, _tmp12__target); #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp18_); -#line 3347 "ViewCollection.c" + _g_object_unref0 (_tmp15_); +#line 3424 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3353 "ViewCollection.c" +#line 3430 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3357 "ViewCollection.c" +#line 3434 "ViewCollection.c" } #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = to_add; + _tmp16_ = to_add; #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = _tmp20_; + _tmp18_ = _tmp17_; #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp21_ > 0) { -#line 3367 "ViewCollection.c" - GeeArrayList* _tmp22_; - GeeCollection* _tmp23_; - GeeCollection* _tmp24_; + if (_tmp18_ > 0) { +#line 3444 "ViewCollection.c" + GeeArrayList* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = to_add; + _tmp19_ = to_add; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp20_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = _tmp23_; + _tmp21_ = _tmp20_; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp24_); -#line 3379 "ViewCollection.c" + _g_object_unref0 (_tmp21_); +#line 3456 "ViewCollection.c" } #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); -#line 3383 "ViewCollection.c" +#line 3460 "ViewCollection.c" } -static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed) { +static void +view_collection_on_mirror_contents_removed (ViewCollection* self, + GeeIterable* removed) +{ Marker* marker = NULL; Marker* _tmp0_; - Marker* _tmp17_; + Marker* _tmp15_; #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3396,112 +3476,108 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge _tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 514 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" marker = _tmp0_; -#line 3399 "ViewCollection.c" +#line 3479 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = removed; + GeeIterator* _tmp1_; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp1_ = gee_iterable_iterator (removed); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3412 "ViewCollection.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3489 "ViewCollection.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; DataView* view = NULL; - DataObject* _tmp7_; - DataView* _tmp8_; + DataObject* _tmp5_; + DataView* _tmp6_; DataView* our_view = NULL; - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; + DataView* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + DataView* _tmp10_; + DataView* _tmp11_; DataView* _tmp12_; - DataView* _tmp13_; + Marker* _tmp13_; DataView* _tmp14_; - Marker* _tmp15_; - DataView* _tmp16_; -#line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _object_it; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3438 "ViewCollection.c" +#line 3512 "ViewCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = object; + _tmp5_ = object; #line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView)); #line 516 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp8_; + view = _tmp6_; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp7_ = view; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp8_ = data_view_get_source (_tmp7_); #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = view_collection_get_view_for_source (self, _tmp11_); + _tmp10_ = view_collection_get_view_for_source (self, _tmp9_); #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 518 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - our_view = _tmp13_; + our_view = _tmp11_; #line 519 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = our_view; + _tmp12_ = our_view; #line 519 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp14_ != NULL, "our_view != null"); + _vala_assert (_tmp12_ != NULL, "our_view != null"); #line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = marker; + _tmp13_ = marker; #line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = our_view; + _tmp14_ = our_view; #line 521 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject)); + marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (our_view); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3482 "ViewCollection.c" +#line 3556 "ViewCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3486 "ViewCollection.c" +#line 3560 "ViewCollection.c" } #line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = marker; + _tmp15_ = marker; #line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp17_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp15_); #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 3494 "ViewCollection.c" +#line 3568 "ViewCollection.c" } -static void view_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { +static void +view_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added) +{ ViewCollection * self; GeeArrayList* added_visible = NULL; GeeArrayList* added_selected = NULL; - GeeArrayList* _tmp30_; - GeeArrayList* _tmp34_; - GeeIterable* _tmp37_; + GeeArrayList* _tmp25_; + GeeArrayList* _tmp28_; #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3510,479 +3586,435 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt added_visible = NULL; #line 530 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" added_selected = NULL; -#line 3513 "ViewCollection.c" +#line 3589 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3526 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3599 "ViewCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataView* view = NULL; - DataObject* _tmp6_; + DataObject* _tmp4_; + DataView* _tmp5_; + GeeHashMap* _tmp6_; DataView* _tmp7_; - GeeHashMap* _tmp8_; - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; + DataSource* _tmp8_; + DataSource* _tmp9_; + DataView* _tmp10_; + gboolean _tmp11_ = FALSE; DataView* _tmp12_; - gboolean _tmp13_ = FALSE; - DataView* _tmp14_; - gboolean _tmp15_; - gboolean _tmp22_ = FALSE; - DataView* _tmp23_; - gboolean _tmp24_; + gboolean _tmp18_ = FALSE; + DataView* _tmp19_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _object_it; -#line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3554 "ViewCollection.c" +#line 3622 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView)); #line 533 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp7_; + view = _tmp5_; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->source_map; + _tmp6_ = self->priv->source_map; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp7_ = view; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp8_ = data_view_get_source (_tmp7_); #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = view; + _tmp10_ = view; #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_); #line 534 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); -#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; -#line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = data_view_is_selected (_tmp14_); + _g_object_unref0 (_tmp9_); #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 3588 "ViewCollection.c" - DataView* _tmp16_; - gboolean _tmp17_; + _tmp12_ = view; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = view; + if (data_view_is_selected (_tmp12_)) { +#line 3654 "ViewCollection.c" + DataView* _tmp13_; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = data_view_is_visible (_tmp16_); + _tmp13_ = view; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp17_; -#line 3597 "ViewCollection.c" + _tmp11_ = data_view_is_visible (_tmp13_); +#line 3660 "ViewCollection.c" } else { #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = FALSE; -#line 3601 "ViewCollection.c" + _tmp11_ = FALSE; +#line 3664 "ViewCollection.c" } #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp13_) { -#line 3605 "ViewCollection.c" - GeeArrayList* _tmp18_; - GeeArrayList* _tmp20_; - DataView* _tmp21_; + if (_tmp11_) { +#line 3668 "ViewCollection.c" + GeeArrayList* _tmp14_; + GeeArrayList* _tmp16_; + DataView* _tmp17_; #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = added_selected; + _tmp14_ = added_selected; #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp18_ == NULL) { -#line 3613 "ViewCollection.c" - GeeArrayList* _tmp19_; + if (_tmp14_ == NULL) { +#line 3676 "ViewCollection.c" + GeeArrayList* _tmp15_; #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp15_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added_selected = _tmp19_; -#line 3621 "ViewCollection.c" + added_selected = _tmp15_; +#line 3684 "ViewCollection.c" } #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = added_selected; + _tmp16_ = added_selected; #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = view; + _tmp17_ = view; #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 3629 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); +#line 3692 "ViewCollection.c" } #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = view; -#line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = data_view_is_visible (_tmp23_); + _tmp19_ = view; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp24_) { -#line 3637 "ViewCollection.c" - DataSet* _tmp25_; + if (data_view_is_visible (_tmp19_)) { +#line 3698 "ViewCollection.c" + DataSet* _tmp20_; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = self->priv->visible; + _tmp20_ = self->priv->visible; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = _tmp25_ != NULL; -#line 3643 "ViewCollection.c" + _tmp18_ = _tmp20_ != NULL; +#line 3704 "ViewCollection.c" } else { #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = FALSE; -#line 3647 "ViewCollection.c" + _tmp18_ = FALSE; +#line 3708 "ViewCollection.c" } #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_) { -#line 3651 "ViewCollection.c" - GeeArrayList* _tmp26_; - GeeArrayList* _tmp28_; - DataView* _tmp29_; + if (_tmp18_) { +#line 3712 "ViewCollection.c" + GeeArrayList* _tmp21_; + GeeArrayList* _tmp23_; + DataView* _tmp24_; #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = added_visible; + _tmp21_ = added_visible; #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp26_ == NULL) { -#line 3659 "ViewCollection.c" - GeeArrayList* _tmp27_; + if (_tmp21_ == NULL) { +#line 3720 "ViewCollection.c" + GeeArrayList* _tmp22_; #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp22_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_visible); #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added_visible = _tmp27_; -#line 3667 "ViewCollection.c" + added_visible = _tmp22_; +#line 3728 "ViewCollection.c" } #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = added_visible; + _tmp23_ = added_visible; #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = view; + _tmp24_ = view; #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_); -#line 3675 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); +#line 3736 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3681 "ViewCollection.c" +#line 3742 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3685 "ViewCollection.c" +#line 3746 "ViewCollection.c" } #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = added_visible; + _tmp25_ = added_visible; #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp30_ != NULL) { -#line 3691 "ViewCollection.c" + if (_tmp25_ != NULL) { +#line 3752 "ViewCollection.c" gboolean is_added = FALSE; - GeeArrayList* _tmp31_; - gboolean _tmp32_; - gboolean _tmp33_; + GeeArrayList* _tmp26_; + gboolean _tmp27_; #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = added_visible; + _tmp26_ = added_visible; #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - is_added = _tmp32_; + is_added = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); #line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = is_added; + _tmp27_ = is_added; #line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp33_, "is_added"); -#line 3706 "ViewCollection.c" + _vala_assert (_tmp27_, "is_added"); +#line 3764 "ViewCollection.c" } #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = added_selected; + _tmp28_ = added_selected; #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp34_ != NULL) { -#line 3712 "ViewCollection.c" - GeeArrayList* _tmp35_; - GeeArrayList* _tmp36_; + if (_tmp28_ != NULL) { +#line 3770 "ViewCollection.c" + GeeArrayList* _tmp29_; + GeeArrayList* _tmp30_; #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = added_selected; + _tmp29_ = added_selected; #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); #line 559 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = added_selected; + _tmp30_ = added_selected; #line 559 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), NULL); -#line 3723 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), NULL); +#line 3781 "ViewCollection.c" } #line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = added; -#line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp37_); + DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), added); #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_visible); -#line 3733 "ViewCollection.c" +#line 3789 "ViewCollection.c" } -static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { +static void +view_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed) +{ ViewCollection * self; GeeArrayList* selected_removed = NULL; - GeeArrayList* _tmp42_; - GeeIterable* _tmp44_; + GeeArrayList* _tmp33_; #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 567 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" selected_removed = NULL; -#line 3748 "ViewCollection.c" +#line 3806 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = removed; + GeeIterator* _tmp0_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (removed); #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3761 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 3816 "ViewCollection.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DataView* view = NULL; - DataObject* _tmp6_; + DataObject* _tmp4_; + DataView* _tmp5_; + GeeHashMap* _tmp6_; DataView* _tmp7_; - GeeHashMap* _tmp8_; - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _object_it; + DataSource* _tmp8_; + DataSource* _tmp9_; + gboolean _tmp10_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3784 "ViewCollection.c" +#line 3835 "ViewCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = object; + _tmp4_ = object; #line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView)); #line 569 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp7_; + view = _tmp5_; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->source_map; -#line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp6_ = self->priv->source_map; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp7_ = view; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = data_view_get_source (_tmp7_); #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp9_ = _tmp8_; #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp9_); #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp13_) { -#line 3814 "ViewCollection.c" + if (_tmp10_) { +#line 3863 "ViewCollection.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp14_; - DataView* _tmp15_; - DataSource* _tmp16_; - DataSource* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; - DataView* _tmp21_; - gboolean _tmp22_; - gboolean _tmp34_ = FALSE; - DataView* _tmp35_; - gboolean _tmp36_; + GeeHashMap* _tmp11_; + DataView* _tmp12_; + DataSource* _tmp13_; + DataSource* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; + DataView* _tmp18_; + gboolean _tmp27_ = FALSE; + DataView* _tmp28_; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = self->priv->source_map; + _tmp11_ = self->priv->source_map; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = view; + _tmp12_ = view; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = data_view_get_source (_tmp15_); + _tmp13_ = data_view_get_source (_tmp12_); #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL); + _tmp15_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, NULL); #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp14_); #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - is_removed = _tmp19_; + is_removed = _tmp16_; #line 577 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = is_removed; + _tmp17_ = is_removed; #line 577 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp20_, "is_removed"); -#line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = view; + _vala_assert (_tmp17_, "is_removed"); #line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = data_view_is_selected (_tmp21_); + _tmp18_ = view; #line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_) { -#line 3854 "ViewCollection.c" - DataSet* _tmp23_; - DataView* _tmp24_; - gboolean _tmp25_; - DataView* _tmp26_; - gboolean _tmp27_; - DataView* _tmp28_; - gboolean _tmp29_; -#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = self->priv->selected; -#line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = view; + if (data_view_is_selected (_tmp18_)) { +#line 3899 "ViewCollection.c" + DataSet* _tmp19_; + DataView* _tmp20_; + DataView* _tmp21_; + DataView* _tmp22_; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = data_set_contains (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = self->priv->selected; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = view; + _tmp20_ = view; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = data_view_is_visible (_tmp26_); + _tmp21_ = view; #line 581 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp25_ == _tmp27_, "selected.contains(view) == view.is_visible()"); -#line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = view; + _vala_assert (data_set_contains (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)) == data_view_is_visible (_tmp21_), "selected.contains(view) == view.is_visible()"); #line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = data_view_is_visible (_tmp28_); + _tmp22_ = view; #line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp29_) { -#line 3880 "ViewCollection.c" - GeeArrayList* _tmp30_; - GeeArrayList* _tmp32_; - DataView* _tmp33_; + if (data_view_is_visible (_tmp22_)) { +#line 3916 "ViewCollection.c" + GeeArrayList* _tmp23_; + GeeArrayList* _tmp25_; + DataView* _tmp26_; #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = selected_removed; + _tmp23_ = selected_removed; #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp30_ == NULL) { -#line 3888 "ViewCollection.c" - GeeArrayList* _tmp31_; + if (_tmp23_ == NULL) { +#line 3924 "ViewCollection.c" + GeeArrayList* _tmp24_; #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp24_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected_removed); #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - selected_removed = _tmp31_; -#line 3896 "ViewCollection.c" + selected_removed = _tmp24_; +#line 3932 "ViewCollection.c" } #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = selected_removed; + _tmp25_ = selected_removed; #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = view; + _tmp26_ = view; #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_); -#line 3904 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); +#line 3940 "ViewCollection.c" } } #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = view; -#line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = data_view_is_visible (_tmp35_); + _tmp28_ = view; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp36_) { -#line 3913 "ViewCollection.c" - DataSet* _tmp37_; + if (data_view_is_visible (_tmp28_)) { +#line 3947 "ViewCollection.c" + DataSet* _tmp29_; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = self->priv->visible; + _tmp29_ = self->priv->visible; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = _tmp37_ != NULL; -#line 3919 "ViewCollection.c" + _tmp27_ = _tmp29_ != NULL; +#line 3953 "ViewCollection.c" } else { #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = FALSE; -#line 3923 "ViewCollection.c" + _tmp27_ = FALSE; +#line 3957 "ViewCollection.c" } #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp34_) { -#line 3927 "ViewCollection.c" - DataSet* _tmp38_; - DataView* _tmp39_; - gboolean _tmp40_; - gboolean _tmp41_; -#line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp38_ = self->priv->visible; + if (_tmp27_) { +#line 3961 "ViewCollection.c" + DataSet* _tmp30_; + DataView* _tmp31_; + gboolean _tmp32_; #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp39_ = view; + _tmp30_ = self->priv->visible; #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp40_ = data_set_remove (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject)); + _tmp31_ = view; #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - is_removed = _tmp40_; + is_removed = data_set_remove (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); #line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp41_ = is_removed; + _tmp32_ = is_removed; #line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp41_, "is_removed"); -#line 3944 "ViewCollection.c" + _vala_assert (_tmp32_, "is_removed"); +#line 3975 "ViewCollection.c" } } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3951 "ViewCollection.c" +#line 3982 "ViewCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3955 "ViewCollection.c" +#line 3986 "ViewCollection.c" } #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp42_ = selected_removed; + _tmp33_ = selected_removed; #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp42_ != NULL) { -#line 3961 "ViewCollection.c" - GeeArrayList* _tmp43_; + if (_tmp33_ != NULL) { +#line 3992 "ViewCollection.c" + GeeArrayList* _tmp34_; #line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp43_ = selected_removed; + _tmp34_ = selected_removed; #line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); #line 604 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_selection_group_altered (self); -#line 3969 "ViewCollection.c" +#line 4000 "ViewCollection.c" } #line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp44_ = removed; -#line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp44_); + DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), removed); #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected_removed); -#line 3977 "ViewCollection.c" +#line 4006 "ViewCollection.c" } -static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views) { +static void +view_collection_filter_altered_items (ViewCollection* self, + GeeCollection* views) +{ GeeArrayList* to_show = NULL; GeeArrayList* to_hide = NULL; - GeeArrayList* _tmp20_; - GeeArrayList* _tmp22_; + GeeArrayList* _tmp15_; + GeeArrayList* _tmp17_; #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3991,256 +4023,210 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle to_show = NULL; #line 614 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" to_hide = NULL; -#line 3994 "ViewCollection.c" +#line 4026 "ViewCollection.c" { GeeIterator* _view_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (views, GEE_TYPE_ITERABLE, GeeIterable)); #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _view_it = _tmp1_; + _view_it = _tmp0_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4007 "ViewCollection.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4036 "ViewCollection.c" + GeeIterator* _tmp1_; DataView* view = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - DataView* _tmp6_; - gboolean _tmp7_; -#line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _view_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataView* _tmp4_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _view_it; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4023 "ViewCollection.c" +#line 4048 "ViewCollection.c" } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _view_it; + _tmp2_ = _view_it; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp5_; -#line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = view; + view = (DataView*) _tmp3_; #line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view_collection_is_in_filter (self, _tmp6_); + _tmp4_ = view; #line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 4037 "ViewCollection.c" - DataView* _tmp8_; - gboolean _tmp9_; + if (view_collection_is_in_filter (self, _tmp4_)) { +#line 4060 "ViewCollection.c" + DataView* _tmp5_; #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view; + _tmp5_ = view; #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = data_view_is_visible (_tmp8_); -#line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp9_) { -#line 4046 "ViewCollection.c" - GeeArrayList* _tmp10_; - GeeArrayList* _tmp12_; - DataView* _tmp13_; + if (!data_view_is_visible (_tmp5_)) { +#line 4066 "ViewCollection.c" + GeeArrayList* _tmp6_; + GeeArrayList* _tmp8_; + DataView* _tmp9_; #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = to_show; + _tmp6_ = to_show; #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { -#line 4054 "ViewCollection.c" - GeeArrayList* _tmp11_; + if (_tmp6_ == NULL) { +#line 4074 "ViewCollection.c" + GeeArrayList* _tmp7_; #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp7_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_show); #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_show = _tmp11_; -#line 4062 "ViewCollection.c" + to_show = _tmp7_; +#line 4082 "ViewCollection.c" } #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = to_show; + _tmp8_ = to_show; #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp9_ = view; #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 4070 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); +#line 4090 "ViewCollection.c" } } else { - DataView* _tmp14_; - gboolean _tmp15_; -#line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; + DataView* _tmp10_; #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = data_view_is_visible (_tmp14_); + _tmp10_ = view; #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 4081 "ViewCollection.c" - GeeArrayList* _tmp16_; - GeeArrayList* _tmp18_; - DataView* _tmp19_; + if (data_view_is_visible (_tmp10_)) { +#line 4098 "ViewCollection.c" + GeeArrayList* _tmp11_; + GeeArrayList* _tmp13_; + DataView* _tmp14_; #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = to_hide; + _tmp11_ = to_hide; #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ == NULL) { -#line 4089 "ViewCollection.c" - GeeArrayList* _tmp17_; + if (_tmp11_ == NULL) { +#line 4106 "ViewCollection.c" + GeeArrayList* _tmp12_; #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_hide); #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - to_hide = _tmp17_; -#line 4097 "ViewCollection.c" + to_hide = _tmp12_; +#line 4114 "ViewCollection.c" } #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = to_hide; + _tmp13_ = to_hide; #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = view; + _tmp14_ = view; #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); -#line 4105 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); +#line 4122 "ViewCollection.c" } } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 4110 "ViewCollection.c" +#line 4127 "ViewCollection.c" } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 4114 "ViewCollection.c" +#line 4131 "ViewCollection.c" } #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = to_show; + _tmp15_ = to_show; #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp20_ != NULL) { -#line 4120 "ViewCollection.c" - GeeArrayList* _tmp21_; + if (_tmp15_ != NULL) { +#line 4137 "ViewCollection.c" + GeeArrayList* _tmp16_; #line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = to_show; + _tmp16_ = to_show; #line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_show_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_LIST, GeeList)); -#line 4126 "ViewCollection.c" + view_collection_show_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList)); +#line 4143 "ViewCollection.c" } #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = to_hide; + _tmp17_ = to_hide; #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_ != NULL) { -#line 4132 "ViewCollection.c" - GeeArrayList* _tmp23_; + if (_tmp17_ != NULL) { +#line 4149 "ViewCollection.c" + GeeArrayList* _tmp18_; #line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = to_hide; + _tmp18_ = to_hide; #line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_hide_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_LIST, GeeList)); -#line 4138 "ViewCollection.c" + view_collection_hide_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList)); +#line 4155 "ViewCollection.c" } #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_hide); #line 610 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_show); -#line 4144 "ViewCollection.c" +#line 4161 "ViewCollection.c" } -static void view_collection_real_items_altered (DataCollection* base, GeeMap* map) { +static void +view_collection_real_items_altered (DataCollection* base, + GeeMap* map) +{ ViewCollection * self; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; - GeeSet* _tmp2_; - GeeCollection* _tmp3_; - GeeMap* _tmp4_; + GeeCollection* _tmp2_; #line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = map; + _tmp0_ = gee_map_get_keys (map); #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; -#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_filter_altered_items (self, _tmp3_); + view_collection_filter_altered_items (self, _tmp2_); #line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); -#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = map; + _g_object_unref0 (_tmp2_); #line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp4_); -#line 4175 "ViewCollection.c" + DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), map); +#line 4189 "ViewCollection.c" } -static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { +static void +view_collection_real_set_comparator (DataCollection* base, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target) +{ ViewCollection * self; DataSet* _tmp0_; - Comparator _tmp1_; - void* _tmp1__target; - ComparatorPredicate _tmp2_; - void* _tmp2__target; - DataSet* _tmp3_; - Comparator _tmp7_; - void* _tmp7__target; - ComparatorPredicate _tmp8_; - void* _tmp8__target; + DataSet* _tmp1_; #line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->selected; #line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = comparator; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1__target = comparator_target; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = predicate; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2__target = predicate_target; -#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); + data_set_set_comparator (_tmp0_, comparator, comparator_target, predicate, predicate_target); #line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = self->priv->visible; + _tmp1_ = self->priv->visible; #line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ != NULL) { -#line 4209 "ViewCollection.c" - DataSet* _tmp4_; - Comparator _tmp5_; - void* _tmp5__target; - ComparatorPredicate _tmp6_; - void* _tmp6__target; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->visible; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = comparator; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5__target = comparator_target; -#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = predicate; + if (_tmp1_ != NULL) { +#line 4213 "ViewCollection.c" + DataSet* _tmp2_; #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6__target = predicate_target; + _tmp2_ = self->priv->visible; #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target); -#line 4227 "ViewCollection.c" + data_set_set_comparator (_tmp2_, comparator, comparator_target, predicate, predicate_target); +#line 4219 "ViewCollection.c" } #line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = comparator; -#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7__target = comparator_target; -#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = predicate; -#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8__target = predicate_target; -#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp7__target, _tmp8_, _tmp8__target); -#line 4239 "ViewCollection.c" + DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), comparator, comparator_target, predicate, predicate_target); +#line 4223 "ViewCollection.c" } -static void view_collection_real_reset_comparator (DataCollection* base) { +static void +view_collection_real_reset_comparator (DataCollection* base) +{ ViewCollection * self; DataSet* _tmp0_; DataSet* _tmp1_; @@ -4254,21 +4240,23 @@ static void view_collection_real_reset_comparator (DataCollection* base) { _tmp1_ = self->priv->visible; #line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4257 "ViewCollection.c" +#line 4243 "ViewCollection.c" DataSet* _tmp2_; #line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_set_reset_comparator (_tmp2_); -#line 4263 "ViewCollection.c" +#line 4249 "ViewCollection.c" } #line 668 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->reset_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 4267 "ViewCollection.c" +#line 4253 "ViewCollection.c" } -static GeeCollection* view_collection_real_get_all (DataCollection* base) { +static GeeCollection* +view_collection_real_get_all (DataCollection* base) +{ ViewCollection * self; GeeCollection* result = NULL; GeeCollection* _tmp0_ = NULL; @@ -4279,7 +4267,7 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) { _tmp1_ = self->priv->visible; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4282 "ViewCollection.c" +#line 4270 "ViewCollection.c" DataSet* _tmp2_; GeeList* _tmp3_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4290,7 +4278,7 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) { _g_object_unref0 (_tmp0_); #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 4293 "ViewCollection.c" +#line 4281 "ViewCollection.c" } else { GeeCollection* _tmp4_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4299,17 +4287,19 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) { _g_object_unref0 (_tmp0_); #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_; -#line 4302 "ViewCollection.c" +#line 4290 "ViewCollection.c" } #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4308 "ViewCollection.c" +#line 4296 "ViewCollection.c" } -GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) { +GeeCollection* +view_collection_get_all_unfiltered (ViewCollection* self) +{ GeeCollection* result = NULL; GeeCollection* _tmp0_; #line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4320,11 +4310,13 @@ GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) { result = _tmp0_; #line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4323 "ViewCollection.c" +#line 4313 "ViewCollection.c" } -static gint view_collection_real_get_count (DataCollection* base) { +static gint +view_collection_real_get_count (DataCollection* base) +{ ViewCollection * self; gint result = 0; gint _tmp0_ = 0; @@ -4335,48 +4327,44 @@ static gint view_collection_real_get_count (DataCollection* base) { _tmp1_ = self->priv->visible; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4338 "ViewCollection.c" +#line 4330 "ViewCollection.c" DataSet* _tmp2_; - gint _tmp3_; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_set_get_count (_tmp2_); -#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp3_; -#line 4347 "ViewCollection.c" + _tmp0_ = data_set_get_count (_tmp2_); +#line 4336 "ViewCollection.c" } else { - gint _tmp4_; -#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 4354 "ViewCollection.c" + _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); +#line 4340 "ViewCollection.c" } #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4360 "ViewCollection.c" +#line 4346 "ViewCollection.c" } -gint view_collection_get_unfiltered_count (ViewCollection* self) { +gint +view_collection_get_unfiltered_count (ViewCollection* self) +{ gint result = 0; - gint _tmp0_; #line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0); #line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp0_; + result = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4375 "ViewCollection.c" +#line 4360 "ViewCollection.c" } -static DataObject* view_collection_real_get_at (DataCollection* base, gint index) { +static DataObject* +view_collection_real_get_at (DataCollection* base, + gint index) +{ ViewCollection * self; DataObject* result = NULL; DataObject* _tmp0_ = NULL; @@ -4387,43 +4375,40 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index _tmp1_ = self->priv->visible; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4390 "ViewCollection.c" +#line 4378 "ViewCollection.c" DataSet* _tmp2_; - gint _tmp3_; - DataObject* _tmp4_; + DataObject* _tmp3_; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = index; -#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = data_set_get_at (_tmp2_, _tmp3_); + _tmp3_ = data_set_get_at (_tmp2_, index); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 4404 "ViewCollection.c" + _tmp0_ = _tmp3_; +#line 4389 "ViewCollection.c" } else { - gint _tmp5_; - DataObject* _tmp6_; -#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = index; + DataObject* _tmp4_; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_); + _tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), index); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp6_; -#line 4416 "ViewCollection.c" + _tmp0_ = _tmp4_; +#line 4398 "ViewCollection.c" } #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4422 "ViewCollection.c" +#line 4404 "ViewCollection.c" } -static gint view_collection_real_index_of (DataCollection* base, DataObject* object) { +static gint +view_collection_real_index_of (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gint result = 0; gint _tmp0_ = 0; @@ -4436,111 +4421,91 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj _tmp1_ = self->priv->visible; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4439 "ViewCollection.c" +#line 4424 "ViewCollection.c" DataSet* _tmp2_; - DataObject* _tmp3_; - gint _tmp4_; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = object; -#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = data_set_index_of (_tmp2_, _tmp3_); -#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 4451 "ViewCollection.c" + _tmp0_ = data_set_index_of (_tmp2_, object); +#line 4430 "ViewCollection.c" } else { - DataObject* _tmp5_; - gint _tmp6_; -#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = object; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_); -#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp6_; -#line 4461 "ViewCollection.c" + _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object); +#line 4434 "ViewCollection.c" } #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4467 "ViewCollection.c" +#line 4440 "ViewCollection.c" } -static gboolean view_collection_real_contains (DataCollection* base, DataObject* object) { +static gboolean +view_collection_real_contains (DataCollection* base, + DataObject* object) +{ ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_; - gboolean _tmp1_; - DataObject* _tmp2_; - gboolean _tmp3_; #line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; -#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->contains (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp0_); -#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp1_) { + if (!DATA_COLLECTION_CLASS (view_collection_parent_class)->contains (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), object)) { #line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4492 "ViewCollection.c" +#line 4460 "ViewCollection.c" } #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = object; -#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = view_collection_is_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView)); -#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = view_collection_is_visible (self, G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4502 "ViewCollection.c" +#line 4466 "ViewCollection.c" } -static DataView* view_collection_real_get_first (ViewCollection* self) { +static DataView* +view_collection_real_get_first (ViewCollection* self) +{ DataView* result = NULL; DataView* _tmp0_ = NULL; - gint _tmp1_; -#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ > 0) { -#line 4514 "ViewCollection.c" - DataObject* _tmp2_; + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) > 0) { +#line 4477 "ViewCollection.c" + DataObject* _tmp1_; #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0); + _tmp1_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0); #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); -#line 4522 "ViewCollection.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); +#line 4485 "ViewCollection.c" } else { #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = NULL; -#line 4528 "ViewCollection.c" +#line 4491 "ViewCollection.c" } #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4534 "ViewCollection.c" +#line 4497 "ViewCollection.c" } -DataView* view_collection_get_first (ViewCollection* self) { +DataView* +view_collection_get_first (ViewCollection* self) +{ #line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_first (self); -#line 4543 "ViewCollection.c" +#line 4508 "ViewCollection.c" } @@ -4554,360 +4519,342 @@ DataView* view_collection_get_first (ViewCollection* self) { * pathological events that have nothing but rejected images * in them from breaking. */ -static DataView* view_collection_real_get_first_unrejected (ViewCollection* self) { +static DataView* +view_collection_real_get_first_unrejected (ViewCollection* self) +{ DataView* result = NULL; - gint _tmp0_; DataView* dv = NULL; - DataView* _tmp1_; + DataView* _tmp0_; gint num_views = 0; - gint _tmp2_; - DataView* _tmp17_; -#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + DataView* _tmp13_; #line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp0_ < 1) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) < 1) { #line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4573 "ViewCollection.c" +#line 4536 "ViewCollection.c" } #line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_first (self); + _tmp0_ = view_collection_get_first (self); #line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - dv = _tmp1_; + dv = _tmp0_; #line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - num_views = _tmp2_; + num_views = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4585 "ViewCollection.c" - gboolean _tmp3_ = FALSE; - DataView* _tmp4_; +#line 4546 "ViewCollection.c" + gboolean _tmp1_ = FALSE; + DataView* _tmp2_; MediaSource* tmp = NULL; - DataView* _tmp8_; - DataSource* _tmp9_; - MediaSource* _tmp10_; - gboolean _tmp11_ = FALSE; - MediaSource* _tmp12_; -#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = dv; + DataView* _tmp5_; + DataSource* _tmp6_; + MediaSource* _tmp7_; + gboolean _tmp8_ = FALSE; + MediaSource* _tmp9_; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp4_ != NULL) { -#line 4598 "ViewCollection.c" - DataView* _tmp5_; - gint _tmp6_; - gint _tmp7_; + _tmp2_ = dv; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = dv; + if (_tmp2_ != NULL) { +#line 4559 "ViewCollection.c" + DataView* _tmp3_; + gint _tmp4_; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp3_ = dv; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = num_views; + _tmp4_ = num_views; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp6_ < (_tmp7_ - 1); -#line 4610 "ViewCollection.c" + _tmp1_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)) < (_tmp4_ - 1); +#line 4568 "ViewCollection.c" } else { #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = FALSE; -#line 4614 "ViewCollection.c" + _tmp1_ = FALSE; +#line 4572 "ViewCollection.c" } #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!_tmp1_) { #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4620 "ViewCollection.c" +#line 4578 "ViewCollection.c" } #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = dv; + _tmp5_ = dv; #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = data_view_get_source (_tmp8_); + _tmp6_ = data_view_get_source (_tmp5_); #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp9_) : NULL; + _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp6_) : NULL; #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp10_ == NULL) { + if (_tmp7_ == NULL) { #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp9_); -#line 4632 "ViewCollection.c" + _g_object_unref0 (_tmp6_); +#line 4590 "ViewCollection.c" } #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - tmp = _tmp10_; -#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = tmp; + tmp = _tmp7_; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp12_ != NULL) { -#line 4640 "ViewCollection.c" - MediaSource* _tmp13_; - Rating _tmp14_; + _tmp9_ = tmp; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = tmp; + if (_tmp9_ != NULL) { +#line 4598 "ViewCollection.c" + MediaSource* _tmp10_; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = media_source_get_rating (_tmp13_); + _tmp10_ = tmp; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp14_ != RATING_REJECTED; -#line 4649 "ViewCollection.c" + _tmp8_ = media_source_get_rating (_tmp10_) != RATING_REJECTED; +#line 4604 "ViewCollection.c" } else { #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = FALSE; -#line 4653 "ViewCollection.c" + _tmp8_ = FALSE; +#line 4608 "ViewCollection.c" } #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp11_) { + if (_tmp8_) { #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = dv; #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (tmp); #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4663 "ViewCollection.c" +#line 4618 "ViewCollection.c" } else { - DataView* _tmp15_; - DataView* _tmp16_; + DataView* _tmp11_; + DataView* _tmp12_; #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = dv; + _tmp11_ = dv; #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = view_collection_get_next (self, _tmp15_); + _tmp12_ = view_collection_get_next (self, _tmp11_); #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (dv); #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - dv = _tmp16_; -#line 4675 "ViewCollection.c" + dv = _tmp12_; +#line 4630 "ViewCollection.c" } #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (tmp); -#line 4679 "ViewCollection.c" +#line 4634 "ViewCollection.c" } #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = view_collection_get_first (self); + _tmp13_ = view_collection_get_first (self); #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp17_; + result = _tmp13_; #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (dv); #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4689 "ViewCollection.c" +#line 4644 "ViewCollection.c" } -DataView* view_collection_get_first_unrejected (ViewCollection* self) { +DataView* +view_collection_get_first_unrejected (ViewCollection* self) +{ #line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_first_unrejected (self); -#line 4698 "ViewCollection.c" +#line 4655 "ViewCollection.c" } -static DataView* view_collection_real_get_last (ViewCollection* self) { +static DataView* +view_collection_real_get_last (ViewCollection* self) +{ DataView* result = NULL; DataView* _tmp0_ = NULL; - gint _tmp1_; -#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ > 0) { -#line 4710 "ViewCollection.c" - gint _tmp2_; - DataObject* _tmp3_; #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) > 0) { +#line 4666 "ViewCollection.c" + DataObject* _tmp1_; #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp2_ - 1); + _tmp1_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) - 1); #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView); -#line 4721 "ViewCollection.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); +#line 4674 "ViewCollection.c" } else { #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = NULL; -#line 4727 "ViewCollection.c" +#line 4680 "ViewCollection.c" } #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4733 "ViewCollection.c" +#line 4686 "ViewCollection.c" } -DataView* view_collection_get_last (ViewCollection* self) { +DataView* +view_collection_get_last (ViewCollection* self) +{ #line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_last (self); -#line 4742 "ViewCollection.c" +#line 4697 "ViewCollection.c" } -static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view) { +static DataView* +view_collection_real_get_next (ViewCollection* self, + DataView* view) +{ DataView* result = NULL; - gint _tmp0_; gint index = 0; - DataView* _tmp1_; + gint _tmp0_; + gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; + DataObject* _tmp4_; #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_VIEW (view), NULL); #line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp0_ == 0) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) == 0) { #line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4768 "ViewCollection.c" +#line 4720 "ViewCollection.c" } #line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; -#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp2_; + index = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = index; + _tmp0_ = index; #line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ < 0) { + if (_tmp0_ < 0) { #line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4784 "ViewCollection.c" +#line 4732 "ViewCollection.c" } #line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = index; + _tmp1_ = index; #line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp4_ + 1; + index = _tmp1_ + 1; #line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = index; + _tmp2_ = index; #line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ >= _tmp6_) { + if (_tmp2_ >= data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { #line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" index = 0; -#line 4798 "ViewCollection.c" +#line 4744 "ViewCollection.c" } #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = index; + _tmp3_ = index; #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); + _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_); #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView); #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4808 "ViewCollection.c" +#line 4754 "ViewCollection.c" } -DataView* view_collection_get_next (ViewCollection* self, DataView* view) { +DataView* +view_collection_get_next (ViewCollection* self, + DataView* view) +{ #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_next (self, view); -#line 4817 "ViewCollection.c" +#line 4766 "ViewCollection.c" } -static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view) { +static DataView* +view_collection_real_get_previous (ViewCollection* self, + DataView* view) +{ DataView* result = NULL; - gint _tmp0_; gint index = 0; - DataView* _tmp1_; + gint _tmp0_; + gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - gint _tmp7_; - DataObject* _tmp8_; + DataObject* _tmp4_; #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_VIEW (view), NULL); #line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp0_ == 0) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) == 0) { #line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4842 "ViewCollection.c" +#line 4789 "ViewCollection.c" } #line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; -#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp2_; + index = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = index; + _tmp0_ = index; #line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ < 0) { + if (_tmp0_ < 0) { #line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4858 "ViewCollection.c" +#line 4801 "ViewCollection.c" } #line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = index; + _tmp1_ = index; #line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp4_ - 1; + index = _tmp1_ - 1; #line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = index; + _tmp2_ = index; #line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ < 0) { -#line 4868 "ViewCollection.c" - gint _tmp6_; + if (_tmp2_ < 0) { #line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - index = _tmp6_ - 1; -#line 4874 "ViewCollection.c" + index = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) - 1; +#line 4813 "ViewCollection.c" } #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = index; + _tmp3_ = index; #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); + _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_); #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView); #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4884 "ViewCollection.c" +#line 4823 "ViewCollection.c" } -DataView* view_collection_get_previous (ViewCollection* self, DataView* view) { +DataView* +view_collection_get_previous (ViewCollection* self, + DataView* view) +{ #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_COLLECTION_GET_CLASS (self)->get_previous (self, view); -#line 4893 "ViewCollection.c" +#line 4835 "ViewCollection.c" } -gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector) { +gboolean +view_collection_get_immediate_neighbors (ViewCollection* self, + DataSource* home, + DataSource* * next, + DataSource* * prev, + const gchar* type_selector) +{ DataSource* _vala_next = NULL; DataSource* _vala_prev = NULL; gboolean result = FALSE; DataView* home_view = NULL; - DataSource* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; DataView* next_view = NULL; + DataView* _tmp2_; DataView* _tmp3_; - DataView* _tmp4_; DataView* prev_view = NULL; - DataView* _tmp19_; - DataView* _tmp20_; + DataView* _tmp16_; + DataView* _tmp17_; #line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4921,15 +4868,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour #line 781 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_prev = NULL; #line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = home; -#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source (self, _tmp0_); + _tmp0_ = view_collection_get_view_for_source (self, home); #line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - home_view = _tmp1_; + home_view = _tmp0_; #line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = home_view; + _tmp1_ = home_view; #line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4938,197 +4883,185 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (next) { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *next = _vala_next; -#line 4941 "ViewCollection.c" +#line 4886 "ViewCollection.c" } else { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); -#line 4945 "ViewCollection.c" +#line 4890 "ViewCollection.c" } #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (prev) { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *prev = _vala_prev; -#line 4951 "ViewCollection.c" +#line 4896 "ViewCollection.c" } else { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); -#line 4955 "ViewCollection.c" +#line 4900 "ViewCollection.c" } #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4959 "ViewCollection.c" +#line 4904 "ViewCollection.c" } #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = home_view; + _tmp2_ = home_view; #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view_collection_get_next (self, _tmp3_); + _tmp3_ = view_collection_get_next (self, _tmp2_); #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_view = _tmp4_; + next_view = _tmp3_; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4969 "ViewCollection.c" +#line 4914 "ViewCollection.c" + DataView* _tmp4_; DataView* _tmp5_; - DataView* _tmp6_; - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_; - DataView* _tmp17_; - DataView* _tmp18_; + gboolean _tmp6_ = FALSE; + DataView* _tmp14_; + DataView* _tmp15_; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = next_view; + _tmp4_ = next_view; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = home_view; + _tmp5_ = home_view; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp5_ != _tmp6_)) { + if (!(_tmp4_ != _tmp5_)) { #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4984 "ViewCollection.c" +#line 4928 "ViewCollection.c" } #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = type_selector; -#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp8_ == NULL) { + if (type_selector == NULL) { #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = TRUE; -#line 4992 "ViewCollection.c" + _tmp6_ = TRUE; +#line 4934 "ViewCollection.c" } else { - DataView* _tmp9_; - DataSource* _tmp10_; - DataSource* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - const gchar* _tmp14_; -#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = next_view; + DataView* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp7_ = next_view; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = _tmp10_; + _tmp8_ = data_view_get_source (_tmp7_); #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_source_get_typename (_tmp11_); + _tmp9_ = _tmp8_; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp10_ = data_source_get_typename (_tmp9_); #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = type_selector; + _tmp11_ = _tmp10_; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = g_strcmp0 (_tmp13_, _tmp14_) == 0; + _tmp6_ = g_strcmp0 (_tmp11_, type_selector) == 0; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp11_); #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); -#line 5018 "ViewCollection.c" + _g_object_unref0 (_tmp9_); +#line 4957 "ViewCollection.c" } #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 5022 "ViewCollection.c" - DataView* _tmp15_; - DataSource* _tmp16_; + if (_tmp6_) { +#line 4961 "ViewCollection.c" + DataView* _tmp12_; + DataSource* _tmp13_; #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = next_view; + _tmp12_ = next_view; #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = data_view_get_source (_tmp15_); + _tmp13_ = data_view_get_source (_tmp12_); #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_next = _tmp16_; + _vala_next = _tmp13_; #line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5035 "ViewCollection.c" +#line 4974 "ViewCollection.c" } #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = next_view; + _tmp14_ = next_view; #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = view_collection_get_next (self, _tmp17_); + _tmp15_ = view_collection_get_next (self, _tmp14_); #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_view); #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_view = _tmp18_; -#line 5045 "ViewCollection.c" + next_view = _tmp15_; +#line 4984 "ViewCollection.c" } #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = home_view; + _tmp16_ = home_view; #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = view_collection_get_previous (self, _tmp19_); + _tmp17_ = view_collection_get_previous (self, _tmp16_); #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev_view = _tmp20_; + prev_view = _tmp17_; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5055 "ViewCollection.c" - DataView* _tmp21_; - DataView* _tmp22_; - gboolean _tmp23_ = FALSE; - const gchar* _tmp24_; - DataView* _tmp33_; - DataView* _tmp34_; +#line 4994 "ViewCollection.c" + DataView* _tmp18_; + DataView* _tmp19_; + gboolean _tmp20_ = FALSE; + DataView* _tmp28_; + DataView* _tmp29_; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = prev_view; + _tmp18_ = prev_view; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = home_view; + _tmp19_ = home_view; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp21_ != _tmp22_)) { + if (!(_tmp18_ != _tmp19_)) { #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5070 "ViewCollection.c" +#line 5008 "ViewCollection.c" } #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = type_selector; + if (type_selector == NULL) { #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp24_ == NULL) { -#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = TRUE; -#line 5078 "ViewCollection.c" + _tmp20_ = TRUE; +#line 5014 "ViewCollection.c" } else { - DataView* _tmp25_; - DataSource* _tmp26_; - DataSource* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - const gchar* _tmp30_; -#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = prev_view; + DataView* _tmp21_; + DataSource* _tmp22_; + DataSource* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = data_view_get_source (_tmp25_); + _tmp21_ = prev_view; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; + _tmp22_ = data_view_get_source (_tmp21_); #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = data_source_get_typename (_tmp27_); + _tmp23_ = _tmp22_; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = _tmp28_; + _tmp24_ = data_source_get_typename (_tmp23_); #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = type_selector; + _tmp25_ = _tmp24_; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = g_strcmp0 (_tmp29_, _tmp30_) == 0; + _tmp20_ = g_strcmp0 (_tmp25_, type_selector) == 0; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp25_); #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp27_); -#line 5104 "ViewCollection.c" + _g_object_unref0 (_tmp23_); +#line 5037 "ViewCollection.c" } #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp23_) { -#line 5108 "ViewCollection.c" - DataView* _tmp31_; - DataSource* _tmp32_; + if (_tmp20_) { +#line 5041 "ViewCollection.c" + DataView* _tmp26_; + DataSource* _tmp27_; #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = prev_view; + _tmp26_ = prev_view; #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = data_view_get_source (_tmp31_); + _tmp27_ = data_view_get_source (_tmp26_); #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_prev = _tmp32_; + _vala_prev = _tmp27_; #line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5121 "ViewCollection.c" +#line 5054 "ViewCollection.c" } #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = prev_view; + _tmp28_ = prev_view; #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = view_collection_get_previous (self, _tmp33_); + _tmp29_ = view_collection_get_previous (self, _tmp28_); #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev_view); #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev_view = _tmp34_; -#line 5131 "ViewCollection.c" + prev_view = _tmp29_; +#line 5064 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5142,43 +5075,44 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (next) { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *next = _vala_next; -#line 5145 "ViewCollection.c" +#line 5078 "ViewCollection.c" } else { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); -#line 5149 "ViewCollection.c" +#line 5082 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (prev) { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *prev = _vala_prev; -#line 5155 "ViewCollection.c" +#line 5088 "ViewCollection.c" } else { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); -#line 5159 "ViewCollection.c" +#line 5092 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5163 "ViewCollection.c" +#line 5096 "ViewCollection.c" } -GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename) { +GeeSet* +view_collection_get_extended_neighbors (ViewCollection* self, + DataSource* home, + const gchar* typename) +{ GeeSet* result = NULL; GeeSet* neighbors = NULL; GeeHashSet* _tmp0_; DataSource* next = NULL; DataSource* prev = NULL; - DataSource* _tmp1_; - const gchar* _tmp2_; - DataSource* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; - gboolean _tmp5_; - DataSource* _tmp6_; - DataSource* _tmp16_; - GeeSet* _tmp26_; - DataSource* _tmp27_; + DataSource* _tmp1_ = NULL; + DataSource* _tmp2_ = NULL; + gboolean _tmp3_; + DataSource* _tmp4_; + DataSource* _tmp13_; + GeeSet* _tmp22_; #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5188,21 +5122,17 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource #line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = home; -#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = typename; -#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = view_collection_get_immediate_neighbors (self, _tmp1_, &_tmp3_, &_tmp4_, _tmp2_); + _tmp3_ = view_collection_get_immediate_neighbors (self, home, &_tmp1_, &_tmp2_, typename); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next = _tmp3_; + next = _tmp1_; #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev = _tmp4_; + prev = _tmp2_; #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp5_) { + if (!_tmp3_) { #line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = neighbors; #line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5211,124 +5141,116 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource _g_object_unref0 (next); #line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5214 "ViewCollection.c" +#line 5144 "ViewCollection.c" } #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = next; + _tmp4_ = next; #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp6_ != NULL) { -#line 5220 "ViewCollection.c" - GeeSet* _tmp7_; - DataSource* _tmp8_; + if (_tmp4_ != NULL) { +#line 5150 "ViewCollection.c" + GeeSet* _tmp5_; + DataSource* _tmp6_; DataSource* next_next = NULL; DataSource* next_prev = NULL; - DataSource* _tmp9_; - const gchar* _tmp10_; - DataSource* _tmp11_ = NULL; - DataSource* _tmp12_ = NULL; - DataSource* _tmp13_; + DataSource* _tmp7_; + DataSource* _tmp8_ = NULL; + DataSource* _tmp9_ = NULL; + DataSource* _tmp10_; #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = neighbors; + _tmp5_ = neighbors; #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = next; + _tmp6_ = next; #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); -#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = next; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = typename; + _tmp7_ = next; #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_get_immediate_neighbors (self, _tmp9_, &_tmp11_, &_tmp12_, _tmp10_); + view_collection_get_immediate_neighbors (self, _tmp7_, &_tmp8_, &_tmp9_, typename); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_next); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_next = _tmp11_; + next_next = _tmp8_; #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); #line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_prev = _tmp12_; + next_prev = _tmp9_; #line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = next_next; + _tmp10_ = next_next; #line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp13_ != NULL) { -#line 5254 "ViewCollection.c" - GeeSet* _tmp14_; - DataSource* _tmp15_; + if (_tmp10_ != NULL) { +#line 5181 "ViewCollection.c" + GeeSet* _tmp11_; + DataSource* _tmp12_; #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = neighbors; + _tmp11_ = neighbors; #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = next_next; + _tmp12_ = next_next; #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); -#line 5263 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_); +#line 5190 "ViewCollection.c" } #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_next); -#line 5269 "ViewCollection.c" +#line 5196 "ViewCollection.c" } #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = prev; + _tmp13_ = prev; #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ != NULL) { -#line 5275 "ViewCollection.c" - GeeSet* _tmp17_; - DataSource* _tmp18_; + if (_tmp13_ != NULL) { +#line 5202 "ViewCollection.c" + GeeSet* _tmp14_; + DataSource* _tmp15_; DataSource* next_prev = NULL; DataSource* prev_prev = NULL; + DataSource* _tmp16_; + DataSource* _tmp17_ = NULL; + DataSource* _tmp18_ = NULL; DataSource* _tmp19_; - const gchar* _tmp20_; - DataSource* _tmp21_ = NULL; - DataSource* _tmp22_ = NULL; - DataSource* _tmp23_; #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = neighbors; + _tmp14_ = neighbors; #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = prev; + _tmp15_ = prev; #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); -#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = prev; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = typename; + _tmp16_ = prev; #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_get_immediate_neighbors (self, _tmp19_, &_tmp21_, &_tmp22_, _tmp20_); + view_collection_get_immediate_neighbors (self, _tmp16_, &_tmp17_, &_tmp18_, typename); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - next_prev = _tmp21_; + next_prev = _tmp17_; #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev_prev); #line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - prev_prev = _tmp22_; + prev_prev = _tmp18_; #line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = prev_prev; + _tmp19_ = prev_prev; #line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp23_ != NULL) { -#line 5309 "ViewCollection.c" - GeeSet* _tmp24_; - DataSource* _tmp25_; + if (_tmp19_ != NULL) { +#line 5233 "ViewCollection.c" + GeeSet* _tmp20_; + DataSource* _tmp21_; #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = neighbors; + _tmp20_ = neighbors; #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = prev_prev; + _tmp21_ = prev_prev; #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); -#line 5318 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); +#line 5242 "ViewCollection.c" } #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (prev_prev); #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (next_prev); -#line 5324 "ViewCollection.c" +#line 5248 "ViewCollection.c" } #line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = neighbors; -#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = home; + _tmp22_ = neighbors; #line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); + gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), home); #line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = neighbors; #line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5337,159 +5259,144 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource _g_object_unref0 (next); #line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5340 "ViewCollection.c" +#line 5262 "ViewCollection.c" } -static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_add_many_selected (ViewCollection* self, + GeeCollection* views) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp11_; - GeeCollection* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; + DataSet* _tmp7_; + gboolean _tmp8_; #line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); #line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; -#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp0_ = gee_collection_get_size (views); #line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5367 "ViewCollection.c" +#line 5287 "ViewCollection.c" } { GeeIterator* _view_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; -#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = views; + GeeIterator* _tmp2_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (views, GEE_TYPE_ITERABLE, GeeIterable)); #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _view_it = _tmp4_; + _view_it = _tmp2_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5381 "ViewCollection.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 5298 "ViewCollection.c" + GeeIterator* _tmp3_; DataView* view = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - DataView* _tmp9_; - gboolean _tmp10_; -#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _view_it; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataView* _tmp6_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _view_it; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5397 "ViewCollection.c" +#line 5310 "ViewCollection.c" } #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _view_it; + _tmp4_ = _view_it; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp8_; -#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + view = (DataView*) _tmp5_; #line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_view_is_visible (_tmp9_); + _tmp6_ = view; #line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp10_, "view.is_visible()"); + _vala_assert (data_view_is_visible (_tmp6_), "view.is_visible()"); #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 5413 "ViewCollection.c" +#line 5324 "ViewCollection.c" } #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 5417 "ViewCollection.c" +#line 5328 "ViewCollection.c" } #line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = self->priv->selected; -#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = views; + _tmp7_ = self->priv->selected; #line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = data_set_add_many (_tmp11_, _tmp12_); -#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added = _tmp13_; + added = data_set_add_many (_tmp7_, views); #line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = added; + _tmp8_ = added; #line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp14_, "added"); -#line 5431 "ViewCollection.c" + _vala_assert (_tmp8_, "added"); +#line 5338 "ViewCollection.c" } -static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_; +static void +view_collection_remove_many_selected (ViewCollection* self, + GeeCollection* views) +{ + gint _tmp0_; gint _tmp1_; - gint _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_; - GeeCollection* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + DataSet* _tmp2_; + gboolean _tmp3_; #line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); #line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = views; + _tmp0_ = gee_collection_get_size (views); #line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp1_ = _tmp0_; #line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; -#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5458 "ViewCollection.c" +#line 5363 "ViewCollection.c" } #line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = self->priv->selected; -#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = views; + _tmp2_ = self->priv->selected; #line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_set_remove_many (_tmp3_, _tmp4_); -#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - removed = _tmp5_; + removed = data_set_remove_many (_tmp2_, views); #line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = removed; + _tmp3_ = removed; #line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp6_, "removed"); -#line 5472 "ViewCollection.c" + _vala_assert (_tmp3_, "removed"); +#line 5373 "ViewCollection.c" } -static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_view_collection_select_item_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = view_collection_select_item ((ViewCollection*) self, object, user); #line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5481 "ViewCollection.c" +#line 5386 "ViewCollection.c" } -void view_collection_select_marked (ViewCollection* self, Marker* marker) { +void +view_collection_select_marked (ViewCollection* self, + Marker* marker) +{ GeeArrayList* selected = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; + GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; - GeeArrayList* _tmp3_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5499,39 +5406,39 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) { #line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" selected = _tmp0_; #line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = marker; -#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = selected; + _tmp1_ = selected; #line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject)); #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = selected; + _tmp2_ = selected; #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ > 0) { -#line 5515 "ViewCollection.c" + if (_tmp4_ > 0) { +#line 5420 "ViewCollection.c" + GeeArrayList* _tmp5_; GeeArrayList* _tmp6_; - GeeArrayList* _tmp7_; #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = selected; + _tmp5_ = selected; #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = selected; + _tmp6_ = selected; #line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), NULL); -#line 5526 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), NULL); +#line 5431 "ViewCollection.c" } #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected); -#line 5530 "ViewCollection.c" +#line 5435 "ViewCollection.c" } -void view_collection_select_all (ViewCollection* self) { +void +view_collection_select_all (ViewCollection* self) +{ Marker* marker = NULL; Marker* _tmp0_; #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5546,20 +5453,21 @@ void view_collection_select_all (ViewCollection* self) { view_collection_select_marked (self, marker); #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5549 "ViewCollection.c" +#line 5456 "ViewCollection.c" } -static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user) { +static gboolean +view_collection_select_item (ViewCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; - DataView* _tmp9_; - DataView* _tmp10_; - gboolean _tmp11_; + DataView* _tmp5_; + DataView* _tmp6_; #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5567,39 +5475,29 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = view; + view = _tmp0_; #line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_view_is_selected (_tmp2_); + _tmp1_ = view; #line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_) { -#line 5581 "ViewCollection.c" - DataView* _tmp4_; - gboolean _tmp5_; -#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; + if (data_view_is_selected (_tmp1_)) { +#line 5485 "ViewCollection.c" + DataView* _tmp2_; #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_view_is_visible (_tmp4_); + _tmp2_ = view; #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_) { -#line 5590 "ViewCollection.c" - DataSet* _tmp6_; - DataView* _tmp7_; - gboolean _tmp8_; + if (data_view_is_visible (_tmp2_)) { +#line 5491 "ViewCollection.c" + DataSet* _tmp3_; + DataView* _tmp4_; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = self->priv->selected; + _tmp3_ = self->priv->selected; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; -#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = data_set_contains (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = view; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp8_, "selected.contains(view)"); -#line 5602 "ViewCollection.c" + _vala_assert (data_set_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)), "selected.contains(view)"); +#line 5500 "ViewCollection.c" } #line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5607,28 +5505,23 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o _g_object_unref0 (view); #line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5610 "ViewCollection.c" +#line 5508 "ViewCollection.c" } #line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp5_ = view; #line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_selected (_tmp9_, TRUE); + data_view_internal_set_selected (_tmp5_, TRUE); #line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = view; + _tmp6_ = view; #line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_view_is_visible (_tmp10_); -#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp11_) { -#line 5622 "ViewCollection.c" - GObject* _tmp12_; - DataView* _tmp13_; -#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = user; + if (data_view_is_visible (_tmp6_)) { +#line 5518 "ViewCollection.c" + DataView* _tmp7_; #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp7_ = view; #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 5631 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); +#line 5524 "ViewCollection.c" } #line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5636,27 +5529,33 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o _g_object_unref0 (view); #line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5639 "ViewCollection.c" +#line 5532 "ViewCollection.c" } -static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_view_collection_unselect_item_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = view_collection_unselect_item ((ViewCollection*) self, object, user); #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5648 "ViewCollection.c" +#line 5545 "ViewCollection.c" } -void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { +void +view_collection_unselect_marked (ViewCollection* self, + Marker* marker) +{ GeeArrayList* unselected = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; + GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; - GeeArrayList* _tmp3_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5666,87 +5565,87 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { #line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = marker; + _tmp1_ = unselected; #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = unselected; -#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject)); #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = unselected; + _tmp2_ = unselected; #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ > 0) { -#line 5682 "ViewCollection.c" + if (_tmp4_ > 0) { +#line 5579 "ViewCollection.c" + GeeArrayList* _tmp5_; GeeArrayList* _tmp6_; - GeeArrayList* _tmp7_; #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = unselected; + _tmp5_ = unselected; #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = unselected; + _tmp6_ = unselected; #line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 5693 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 5590 "ViewCollection.c" } #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 5697 "ViewCollection.c" +#line 5594 "ViewCollection.c" } -void view_collection_unselect_all (ViewCollection* self) { +void +view_collection_unselect_all (ViewCollection* self) +{ DataSet* _tmp0_; - gint _tmp1_; Marker* marker = NULL; + Marker* _tmp1_; Marker* _tmp2_; - Marker* _tmp3_; + GeeList* _tmp3_; GeeList* _tmp4_; - GeeList* _tmp5_; - Marker* _tmp6_; + Marker* _tmp5_; #line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->selected; #line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp1_ == 0) { + if (data_set_get_count (_tmp0_) == 0) { #line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5720 "ViewCollection.c" +#line 5616 "ViewCollection.c" } #line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + _tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker = _tmp2_; + marker = _tmp1_; #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = marker; + _tmp2_ = marker; #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view_collection_get_selected (self); + _tmp3_ = view_collection_get_selected (self); #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + marker_mark_many (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = marker; + _tmp5_ = marker; #line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_unselect_marked (self, _tmp6_); + view_collection_unselect_marked (self, _tmp5_); #line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5742 "ViewCollection.c" +#line 5638 "ViewCollection.c" } -void view_collection_unselect_all_but (ViewCollection* self, DataView* exception) { +void +view_collection_unselect_all_but (ViewCollection* self, + DataView* exception) +{ Marker* marker = NULL; Marker* _tmp0_; - Marker* _tmp15_; + Marker* _tmp13_; #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5755,7 +5654,7 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception _tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" marker = _tmp0_; -#line 5758 "ViewCollection.c" +#line 5657 "ViewCollection.c" { GeeIterator* _object_it = NULL; GeeCollection* _tmp1_; @@ -5776,86 +5675,81 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception _object_it = _tmp4_; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5779 "ViewCollection.c" +#line 5678 "ViewCollection.c" GeeIterator* _tmp5_; - gboolean _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; DataView* view = NULL; - DataObject* _tmp9_; + DataObject* _tmp8_; + DataView* _tmp9_; DataView* _tmp10_; - DataView* _tmp11_; - DataView* _tmp12_; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _object_it; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5798 "ViewCollection.c" +#line 5693 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _object_it; + _tmp6_ = _object_it; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp8_; + object = (DataObject*) _tmp7_; #line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = object; + _tmp8_ = object; #line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); #line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp10_; + view = _tmp9_; #line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = view; -#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = exception; + _tmp10_ = view; #line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp11_ != _tmp12_) { -#line 5818 "ViewCollection.c" - Marker* _tmp13_; - DataView* _tmp14_; + if (_tmp10_ != exception) { +#line 5711 "ViewCollection.c" + Marker* _tmp11_; + DataView* _tmp12_; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = marker; + _tmp11_ = marker; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; + _tmp12_ = view; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 5827 "ViewCollection.c" + marker_mark (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); +#line 5720 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 5833 "ViewCollection.c" +#line 5726 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 5837 "ViewCollection.c" +#line 5730 "ViewCollection.c" } #line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = marker; + _tmp13_ = marker; #line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_unselect_marked (self, _tmp15_); + view_collection_unselect_marked (self, _tmp13_); #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5845 "ViewCollection.c" +#line 5738 "ViewCollection.c" } -static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user) { +static gboolean +view_collection_unselect_item (ViewCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; - DataView* _tmp7_; - GObject* _tmp8_; - DataView* _tmp9_; + DataView* _tmp4_; + DataView* _tmp5_; #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5863,64 +5757,57 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = view; + view = _tmp0_; #line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_view_is_selected (_tmp2_); + _tmp1_ = view; #line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { -#line 5877 "ViewCollection.c" - DataSet* _tmp4_; - DataView* _tmp5_; - gboolean _tmp6_; -#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->selected; + if (!data_view_is_selected (_tmp1_)) { +#line 5767 "ViewCollection.c" + DataSet* _tmp2_; + DataView* _tmp3_; #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = view; + _tmp2_ = self->priv->selected; #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = data_set_contains (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp3_ = view; #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp6_, "!selected.contains(view)"); + _vala_assert (!data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)"); #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5895 "ViewCollection.c" +#line 5782 "ViewCollection.c" } #line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; + _tmp4_ = view; #line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_selected (_tmp7_, FALSE); -#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = user; + data_view_internal_set_selected (_tmp4_, FALSE); #line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = view; + _tmp5_ = view; #line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (user, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5913 "ViewCollection.c" +#line 5798 "ViewCollection.c" } -void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select) { +void +view_collection_unselect_and_select_marked (ViewCollection* self, + Marker* unselect, + Marker* select) +{ GeeArrayList* unselected = NULL; GeeArrayList* _tmp0_; - Marker* _tmp1_; GeeArrayList* selected = NULL; - GeeArrayList* _tmp2_; - Marker* _tmp3_; + GeeArrayList* _tmp1_; #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5932,19 +5819,15 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u #line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = unselect; -#line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (unselected, G_TYPE_OBJECT, GObject)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), unselect, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (unselected, G_TYPE_OBJECT, GObject)); #line 959 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection)); #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - selected = _tmp2_; + selected = _tmp1_; #line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = select; -#line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (selected, G_TYPE_OBJECT, GObject)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), select, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (selected, G_TYPE_OBJECT, GObject)); #line 964 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_COLLECTION, GeeCollection)); #line 966 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5953,27 +5836,33 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u _g_object_unref0 (selected); #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 5956 "ViewCollection.c" +#line 5839 "ViewCollection.c" } -static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self) { +static gboolean +_view_collection_toggle_item_marked_action (DataObject* object, + GObject* user, + gpointer self) +{ gboolean result; result = view_collection_toggle_item ((ViewCollection*) self, object, user); #line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5965 "ViewCollection.c" +#line 5852 "ViewCollection.c" } -void view_collection_toggle_marked (ViewCollection* self, Marker* marker) { +void +view_collection_toggle_marked (ViewCollection* self, + Marker* marker) +{ ViewCollectionToggleLists* lists = NULL; ViewCollectionToggleLists* _tmp0_; - Marker* _tmp1_; + GeeArrayList* _tmp1_; GeeArrayList* _tmp2_; GeeArrayList* _tmp3_; GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5983,39 +5872,38 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) { #line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" lists = _tmp0_; #line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = marker; -#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_toggle_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (lists, G_TYPE_OBJECT, GObject)); + data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), marker, _view_collection_toggle_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (lists, G_TYPE_OBJECT, GObject)); #line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = lists->selected; + _tmp1_ = lists->selected; #line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = lists->unselected; + _tmp2_ = lists->unselected; #line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = lists->selected; + _tmp3_ = lists->selected; #line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = lists->unselected; + _tmp4_ = lists->unselected; #line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (lists); -#line 6005 "ViewCollection.c" +#line 5892 "ViewCollection.c" } -static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user) { +static gboolean +view_collection_toggle_item (ViewCollection* self, + DataObject* object, + GObject* user) +{ gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_; - DataView* _tmp1_; + DataView* _tmp0_; ViewCollectionToggleLists* lists = NULL; - GObject* _tmp2_; - ViewCollectionToggleLists* _tmp3_; - DataView* _tmp4_; - gboolean _tmp5_; + ViewCollectionToggleLists* _tmp1_; + DataView* _tmp2_; #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6023,59 +5911,50 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = object; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView)); #line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView)); -#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = user; + view = _tmp0_; #line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists)); + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (user, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists)); #line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - lists = _tmp3_; + lists = _tmp1_; #line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; -#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_view_internal_toggle (_tmp4_); + _tmp2_ = view; #line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_) { -#line 6043 "ViewCollection.c" - DataView* _tmp6_; - gboolean _tmp7_; -#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = view; + if (data_view_internal_toggle (_tmp2_)) { +#line 5925 "ViewCollection.c" + DataView* _tmp3_; #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = data_view_is_visible (_tmp6_); + _tmp3_ = view; #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp7_) { -#line 6052 "ViewCollection.c" - ViewCollectionToggleLists* _tmp8_; - GeeArrayList* _tmp9_; - DataView* _tmp10_; + if (data_view_is_visible (_tmp3_)) { +#line 5931 "ViewCollection.c" + ViewCollectionToggleLists* _tmp4_; + GeeArrayList* _tmp5_; + DataView* _tmp6_; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = lists; + _tmp4_ = lists; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = _tmp8_->selected; + _tmp5_ = _tmp4_->selected; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = view; + _tmp6_ = view; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 6064 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_); +#line 5943 "ViewCollection.c" } } else { - ViewCollectionToggleLists* _tmp11_; - GeeArrayList* _tmp12_; - DataView* _tmp13_; + ViewCollectionToggleLists* _tmp7_; + GeeArrayList* _tmp8_; + DataView* _tmp9_; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = lists; + _tmp7_ = lists; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _tmp11_->unselected; + _tmp8_ = _tmp7_->unselected; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp9_ = view; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 6078 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); +#line 5957 "ViewCollection.c" } #line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -6085,29 +5964,30 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o _g_object_unref0 (view); #line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6088 "ViewCollection.c" +#line 5967 "ViewCollection.c" } -gint view_collection_get_selected_count (ViewCollection* self) { +gint +view_collection_get_selected_count (ViewCollection* self) +{ gint result = 0; DataSet* _tmp0_; - gint _tmp1_; #line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0); #line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->selected; #line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = data_set_get_count (_tmp0_); -#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp1_; + result = data_set_get_count (_tmp0_); #line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6106 "ViewCollection.c" +#line 5984 "ViewCollection.c" } -GeeList* view_collection_get_selected (ViewCollection* self) { +GeeList* +view_collection_get_selected (ViewCollection* self) +{ GeeList* result = NULL; DataSet* _tmp0_; GeeList* _tmp1_; @@ -6121,32 +6001,35 @@ GeeList* view_collection_get_selected (ViewCollection* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList); #line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6124 "ViewCollection.c" +#line 6004 "ViewCollection.c" } -DataView* view_collection_get_selected_at (ViewCollection* self, gint index) { +DataView* +view_collection_get_selected_at (ViewCollection* self, + gint index) +{ DataView* result = NULL; DataSet* _tmp0_; - gint _tmp1_; - DataObject* _tmp2_; + DataObject* _tmp1_; #line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->selected; #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = index; -#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_set_get_at (_tmp0_, _tmp1_); + _tmp1_ = data_set_get_at (_tmp0_, index); #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6145 "ViewCollection.c" +#line 6025 "ViewCollection.c" } -static gboolean view_collection_is_visible (ViewCollection* self, DataView* view) { +static gboolean +view_collection_is_visible (ViewCollection* self, + DataView* view) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; DataSet* _tmp1_; @@ -6158,41 +6041,34 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view _tmp1_ = self->priv->visible; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 6161 "ViewCollection.c" +#line 6044 "ViewCollection.c" DataSet* _tmp2_; - DataView* _tmp3_; - gboolean _tmp4_; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = view; -#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); -#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = _tmp4_; -#line 6173 "ViewCollection.c" + _tmp0_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); +#line 6050 "ViewCollection.c" } else { #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = TRUE; -#line 6177 "ViewCollection.c" +#line 6054 "ViewCollection.c" } #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp0_; #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6183 "ViewCollection.c" +#line 6060 "ViewCollection.c" } -static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many) { +static gboolean +view_collection_add_many_visible (ViewCollection* self, + GeeCollection* many) +{ gboolean result = FALSE; DataSet* _tmp0_; DataSet* _tmp1_; - GeeCollection* _tmp2_; - gboolean _tmp3_; - DataSet* _tmp4_; - gint _tmp5_; - gint _tmp6_; + DataSet* _tmp2_; #line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6205,64 +6081,55 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle result = TRUE; #line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6208 "ViewCollection.c" +#line 6084 "ViewCollection.c" } #line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->visible; #line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = many; -#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_set_add_many (_tmp1_, _tmp2_); -#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { + if (!data_set_add_many (_tmp1_, many)) { #line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6222 "ViewCollection.c" +#line 6094 "ViewCollection.c" } #line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = self->priv->visible; + _tmp2_ = self->priv->visible; #line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_set_get_count (_tmp4_); -#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ == _tmp6_) { + if (data_set_get_count (_tmp2_) == DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { #line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_set_unref0 (self->priv->visible); #line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->visible = NULL; -#line 6236 "ViewCollection.c" +#line 6104 "ViewCollection.c" } #line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6242 "ViewCollection.c" +#line 6110 "ViewCollection.c" } -static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) { +static void +view_collection_hide_items (ViewCollection* self, + GeeList* to_hide) +{ GeeArrayList* unselected = NULL; GeeArrayList* _tmp0_; gint count = 0; - GeeList* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; - DataSet* _tmp22_; + DataSet* _tmp17_; gboolean removed = FALSE; - DataSet* _tmp24_; - GeeList* _tmp25_; - gboolean _tmp26_; - gboolean _tmp27_; - GeeArrayList* _tmp28_; - GeeArrayList* _tmp29_; - gint _tmp30_; - gint _tmp31_; - GeeList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + DataSet* _tmp19_; + gboolean _tmp20_; + GeeArrayList* _tmp21_; + GeeArrayList* _tmp22_; + gint _tmp23_; + gint _tmp24_; + gint _tmp26_; + gint _tmp27_; #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6272,206 +6139,178 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) #line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = to_hide; + _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp3_; -#line 6282 "ViewCollection.c" + count = _tmp2_; +#line 6147 "ViewCollection.c" { gint ctr = 0; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 6287 "ViewCollection.c" +#line 6152 "ViewCollection.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = TRUE; + _tmp3_ = TRUE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6294 "ViewCollection.c" +#line 6159 "ViewCollection.c" + gint _tmp5_; gint _tmp6_; - gint _tmp7_; DataView* view = NULL; - GeeList* _tmp8_; - gint _tmp9_; - gpointer _tmp10_; - DataView* _tmp11_; - gboolean _tmp12_; - DataView* _tmp13_; - gboolean _tmp14_; - DataView* _tmp21_; + gint _tmp7_; + gpointer _tmp8_; + DataView* _tmp9_; + DataView* _tmp10_; + DataView* _tmp16_; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { -#line 6308 "ViewCollection.c" - gint _tmp5_; + if (!_tmp3_) { +#line 6170 "ViewCollection.c" + gint _tmp4_; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ctr = _tmp5_ + 1; -#line 6314 "ViewCollection.c" + ctr = _tmp4_ + 1; +#line 6176 "ViewCollection.c" } #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = FALSE; + _tmp3_ = FALSE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = ctr; + _tmp5_ = ctr; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = count; + _tmp6_ = count; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp6_ < _tmp7_)) { + if (!(_tmp5_ < _tmp6_)) { #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6326 "ViewCollection.c" +#line 6188 "ViewCollection.c" } #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = to_hide; -#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = ctr; + _tmp7_ = ctr; #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_list_get (_tmp8_, _tmp9_); + _tmp8_ = gee_list_get (to_hide, _tmp7_); #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp10_; + view = (DataView*) _tmp8_; #line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = view; -#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_view_is_visible (_tmp11_); + _tmp9_ = view; #line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp12_, "view.is_visible()"); -#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _vala_assert (data_view_is_visible (_tmp9_), "view.is_visible()"); #line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = data_view_is_selected (_tmp13_); + _tmp10_ = view; #line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp14_) { -#line 6348 "ViewCollection.c" - DataView* _tmp15_; - GeeArrayList* _tmp16_; - DataView* _tmp17_; + if (data_view_is_selected (_tmp10_)) { +#line 6204 "ViewCollection.c" + DataView* _tmp11_; + GeeArrayList* _tmp12_; + DataView* _tmp13_; #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = view; + _tmp11_ = view; #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_selected (_tmp15_, FALSE); + data_view_internal_set_selected (_tmp11_, FALSE); #line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = unselected; + _tmp12_ = unselected; #line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = view; + _tmp13_ = view; #line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 6362 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); +#line 6218 "ViewCollection.c" } else { - DataSet* _tmp18_; - DataView* _tmp19_; - gboolean _tmp20_; -#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = self->priv->selected; + DataSet* _tmp14_; + DataView* _tmp15_; #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = view; + _tmp14_ = self->priv->selected; #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = data_set_contains (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); + _tmp15_ = view; #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp20_, "!selected.contains(view)"); -#line 6375 "ViewCollection.c" + _vala_assert (!data_set_contains (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)"); +#line 6228 "ViewCollection.c" } #line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = view; + _tmp16_ = view; #line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (_tmp21_, FALSE); + data_view_internal_set_visible (_tmp16_, FALSE); #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 6383 "ViewCollection.c" +#line 6236 "ViewCollection.c" } } } #line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = self->priv->visible; + _tmp17_ = self->priv->visible; #line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp22_ == NULL) { -#line 6391 "ViewCollection.c" - DataSet* _tmp23_; + if (_tmp17_ == NULL) { +#line 6244 "ViewCollection.c" + DataSet* _tmp18_; #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + _tmp18_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_set_unref0 (self->priv->visible); #line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->visible = _tmp23_; -#line 6399 "ViewCollection.c" + self->priv->visible = _tmp18_; +#line 6252 "ViewCollection.c" } #line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = self->priv->visible; -#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = to_hide; + _tmp19_ = self->priv->visible; #line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = data_set_remove_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - removed = _tmp26_; + removed = data_set_remove_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = removed; + _tmp20_ = removed; #line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp27_, "removed"); + _vala_assert (_tmp20_, "removed"); #line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = unselected; + _tmp21_ = unselected; #line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = unselected; + _tmp22_ = unselected; #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = _tmp30_; + _tmp24_ = _tmp23_; #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp31_ > 0) { -#line 6425 "ViewCollection.c" - GeeArrayList* _tmp32_; + if (_tmp24_ > 0) { +#line 6274 "ViewCollection.c" + GeeArrayList* _tmp25_; #line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = unselected; + _tmp25_ = unselected; #line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 6431 "ViewCollection.c" + view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6280 "ViewCollection.c" } #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp33_ = to_hide; -#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp35_ = _tmp34_; + _tmp27_ = _tmp26_; #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp35_ > 0) { -#line 6441 "ViewCollection.c" - GeeList* _tmp36_; - GeeList* _tmp37_; -#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp36_ = to_hide; + if (_tmp27_ > 0) { #line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp37_ = to_hide; + view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); #line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 6452 "ViewCollection.c" + view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (to_hide, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6292 "ViewCollection.c" } #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 6456 "ViewCollection.c" +#line 6296 "ViewCollection.c" } -static void view_collection_show_items (ViewCollection* self, GeeList* to_show) { +static void +view_collection_show_items (ViewCollection* self, + GeeList* to_show) +{ GeeArrayList* added_selected = NULL; GeeArrayList* _tmp0_; gint count = 0; - GeeList* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; gboolean added = FALSE; - GeeList* _tmp21_; - gboolean _tmp22_; - gboolean _tmp23_; - GeeArrayList* _tmp24_; - GeeList* _tmp25_; - gint _tmp26_; - gint _tmp27_; + gboolean _tmp16_; + GeeArrayList* _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6481,185 +6320,160 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) #line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" added_selected = _tmp0_; #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = to_show; -#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp3_; -#line 6491 "ViewCollection.c" + count = _tmp2_; +#line 6328 "ViewCollection.c" { gint ctr = 0; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 6496 "ViewCollection.c" +#line 6333 "ViewCollection.c" { - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = TRUE; + _tmp3_ = TRUE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6503 "ViewCollection.c" +#line 6340 "ViewCollection.c" + gint _tmp5_; gint _tmp6_; - gint _tmp7_; DataView* view = NULL; - GeeList* _tmp8_; - gint _tmp9_; - gpointer _tmp10_; + gint _tmp7_; + gpointer _tmp8_; + DataView* _tmp9_; + DataView* _tmp10_; DataView* _tmp11_; - gboolean _tmp12_; - DataView* _tmp13_; - DataView* _tmp14_; - gboolean _tmp15_; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { -#line 6517 "ViewCollection.c" - gint _tmp5_; + if (!_tmp3_) { +#line 6351 "ViewCollection.c" + gint _tmp4_; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ctr = _tmp5_ + 1; -#line 6523 "ViewCollection.c" + ctr = _tmp4_ + 1; +#line 6357 "ViewCollection.c" } #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = FALSE; + _tmp3_ = FALSE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = ctr; + _tmp5_ = ctr; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = count; + _tmp6_ = count; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp6_ < _tmp7_)) { + if (!(_tmp5_ < _tmp6_)) { #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6535 "ViewCollection.c" +#line 6369 "ViewCollection.c" } #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = to_show; -#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = ctr; + _tmp7_ = ctr; #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = gee_list_get (_tmp8_, _tmp9_); + _tmp8_ = gee_list_get (to_show, _tmp7_); #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp10_; -#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = view; + view = (DataView*) _tmp8_; #line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_view_is_visible (_tmp11_); + _tmp9_ = view; #line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp12_, "!view.is_visible()"); + _vala_assert (!data_view_is_visible (_tmp9_), "!view.is_visible()"); #line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = view; + _tmp10_ = view; #line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - data_view_internal_set_visible (_tmp13_, TRUE); -#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = view; + data_view_internal_set_visible (_tmp10_, TRUE); #line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = data_view_is_selected (_tmp14_); + _tmp11_ = view; #line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 6561 "ViewCollection.c" - DataSet* _tmp16_; - DataView* _tmp17_; - gboolean _tmp18_; - GeeArrayList* _tmp19_; - DataView* _tmp20_; -#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = self->priv->selected; + if (data_view_is_selected (_tmp11_)) { +#line 6389 "ViewCollection.c" + DataSet* _tmp12_; + DataView* _tmp13_; + GeeArrayList* _tmp14_; + DataView* _tmp15_; #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = view; + _tmp12_ = self->priv->selected; #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = data_set_contains (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); + _tmp13_ = view; #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (!_tmp18_, "!selected.contains(view)"); + _vala_assert (!data_set_contains (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)), "!selected.contains(view)"); #line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = added_selected; + _tmp14_ = added_selected; #line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = view; + _tmp15_ = view; #line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); -#line 6581 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); +#line 6406 "ViewCollection.c" } #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 6585 "ViewCollection.c" +#line 6410 "ViewCollection.c" } } } #line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp21_ = to_show; -#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp22_ = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - added = _tmp22_; + added = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp23_ = added; + _tmp16_ = added; #line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp23_, "added"); + _vala_assert (_tmp16_, "added"); #line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp24_ = added_selected; + _tmp17_ = added_selected; #line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp25_ = to_show; + view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = _tmp26_; + _tmp19_ = _tmp18_; #line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp27_ > 0) { -#line 6611 "ViewCollection.c" - GeeList* _tmp28_; - GeeList* _tmp29_; + if (_tmp19_ > 0) { #line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp28_ = to_show; -#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp29_ = to_show; + view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); #line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 6622 "ViewCollection.c" + view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (to_show, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6434 "ViewCollection.c" } #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); -#line 6626 "ViewCollection.c" +#line 6438 "ViewCollection.c" } -gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source) { +gboolean +view_collection_has_view_for_source (ViewCollection* self, + DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = source; + _tmp0_ = view_collection_get_view_for_source (self, source); #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source (self, _tmp0_); -#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_ != NULL; + _tmp2_ = _tmp1_ != NULL; #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = _tmp2_; #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6654 "ViewCollection.c" +#line 6466 "ViewCollection.c" } -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source) { +DataView* +view_collection_get_view_for_source (ViewCollection* self, + DataSource* source) +{ DataView* result = NULL; GeeHashMap* _tmp0_; - DataSource* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6667,53 +6481,53 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->source_map; #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = source; -#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.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), source); #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = (DataView*) _tmp2_; + result = (DataView*) _tmp1_; #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6677 "ViewCollection.c" +#line 6489 "ViewCollection.c" } -gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source) { +gboolean +view_collection_has_view_for_source_with_filtered (ViewCollection* self, + DataSource* source) +{ gboolean result = FALSE; - DataSource* _tmp0_; + DataView* _tmp0_; DataView* _tmp1_; - DataView* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = source; + _tmp0_ = view_collection_get_view_for_source_filtered (self, source); #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source_filtered (self, _tmp0_); + _tmp1_ = _tmp0_; #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp1_; -#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_ != NULL; + _tmp2_ = _tmp1_ != NULL; #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = _tmp2_; #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6705 "ViewCollection.c" +#line 6517 "ViewCollection.c" } -DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source) { +DataView* +view_collection_get_view_for_source_filtered (ViewCollection* self, + DataSource* source) +{ DataView* result = NULL; DataView* view = NULL; GeeHashMap* _tmp0_; - DataSource* _tmp1_; - gpointer _tmp2_; - gboolean _tmp3_ = FALSE; - DataView* _tmp4_; + gpointer _tmp1_; + gboolean _tmp2_ = FALSE; + DataView* _tmp3_; #line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6721,49 +6535,46 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da #line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->source_map; #line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = source; -#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.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), source); #line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp2_; -#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; + view = (DataView*) _tmp1_; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp4_ != NULL) { -#line 6733 "ViewCollection.c" - DataView* _tmp5_; - gboolean _tmp6_; + _tmp3_ = view; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = view; + if (_tmp3_ != NULL) { +#line 6545 "ViewCollection.c" + DataView* _tmp4_; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = view_collection_is_in_filter (self, _tmp5_); + _tmp4_ = view; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = !_tmp6_; -#line 6742 "ViewCollection.c" + _tmp2_ = !view_collection_is_in_filter (self, _tmp4_); +#line 6551 "ViewCollection.c" } else { #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = FALSE; -#line 6746 "ViewCollection.c" + _tmp2_ = FALSE; +#line 6555 "ViewCollection.c" } #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_) { + if (_tmp2_) { #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = NULL; #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6756 "ViewCollection.c" +#line 6565 "ViewCollection.c" } #line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = view; #line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6762 "ViewCollection.c" +#line 6571 "ViewCollection.c" } -GeeCollection* view_collection_get_sources (ViewCollection* self) { +GeeCollection* +view_collection_get_sources (ViewCollection* self) +{ GeeCollection* result = NULL; GeeHashMap* _tmp0_; GeeSet* _tmp1_; @@ -6794,85 +6605,70 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) { result = _tmp6_; #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6797 "ViewCollection.c" +#line 6608 "ViewCollection.c" } -gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { +gboolean +view_collection_has_source_of_type (ViewCollection* self, + GType t) +{ gboolean result = FALSE; - GType _tmp0_; - gboolean _tmp1_; #line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); -#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = t; -#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE); + g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); -#line 6813 "ViewCollection.c" + _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))"); +#line 6621 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeHashMap* _tmp2_; + GeeHashMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; GeeSet* _tmp3_; - GeeSet* _tmp4_; - GeeSet* _tmp5_; - GeeIterator* _tmp6_; - GeeIterator* _tmp7_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = self->priv->source_map; + _tmp0_ = self->priv->source_map; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _source_it = _tmp7_; + _source_it = _tmp5_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6840 "ViewCollection.c" - GeeIterator* _tmp8_; - gboolean _tmp9_; +#line 6648 "ViewCollection.c" + GeeIterator* _tmp6_; DataSource* source = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; -#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _source_it; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataSource* _tmp9_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_next (_tmp8_); + _tmp6_ = _source_it; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp6_)) { #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6858 "ViewCollection.c" +#line 6660 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = _source_it; + _tmp7_ = _source_it; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = (DataSource*) _tmp11_; -#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = source; -#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject)); -#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; + source = (DataSource*) _tmp8_; #line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); + _tmp9_ = source; #line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { + if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t)) { #line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; #line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6881,263 +6677,234 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { _g_object_unref0 (_source_it); #line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6884 "ViewCollection.c" +#line 6680 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 6888 "ViewCollection.c" +#line 6684 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 6892 "ViewCollection.c" +#line 6688 "ViewCollection.c" } #line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = FALSE; #line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6898 "ViewCollection.c" +#line 6694 "ViewCollection.c" } -gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) { +gint +view_collection_get_sources_of_type_count (ViewCollection* self, + GType t) +{ gint result = 0; - GType _tmp0_; - gboolean _tmp1_; gint count = 0; #line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0); #line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = t; -#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE); -#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); + _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))"); #line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" count = 0; -#line 6917 "ViewCollection.c" +#line 6710 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + _tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp3_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6938 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 6731 "ViewCollection.c" + GeeIterator* _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - DataObject* _tmp10_; - DataSource* _tmp11_; - DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; -#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataObject* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + gboolean _tmp10_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _object_it; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6959 "ViewCollection.c" +#line 6746 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp5_ = _object_it; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp9_; -#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = object; -#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView)); -#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _tmp11_; + object = (DataObject*) _tmp6_; #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject)); + _tmp7_ = object; #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; + _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); + _tmp9_ = _tmp8_; #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = _tmp15_; + _tmp10_ = g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t); #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp9_); #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_) { -#line 6985 "ViewCollection.c" - gint _tmp17_; + if (_tmp10_) { +#line 6766 "ViewCollection.c" + gint _tmp11_; #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = count; + _tmp11_ = count; #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp17_ + 1; -#line 6991 "ViewCollection.c" + count = _tmp11_ + 1; +#line 6772 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 6995 "ViewCollection.c" +#line 6776 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 6999 "ViewCollection.c" +#line 6780 "ViewCollection.c" } #line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = count; #line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7005 "ViewCollection.c" +#line 6786 "ViewCollection.c" } -GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { +GeeList* +view_collection_get_sources_of_type (ViewCollection* self, + GType t) +{ GeeList* result = NULL; - GType _tmp0_; - gboolean _tmp1_; GeeList* sources = NULL; #line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = t; -#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE); -#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); + _vala_assert (g_type_is_a (t, TYPE_DATA_SOURCE), "t.is_a(typeof(DataSource))"); #line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sources = NULL; -#line 7024 "ViewCollection.c" +#line 6802 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp2_; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); + _tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _object_it = _tmp5_; + _object_it = _tmp3_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7045 "ViewCollection.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 6823 "ViewCollection.c" + GeeIterator* _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp5_; + gpointer _tmp6_; DataSource* source = NULL; - DataObject* _tmp10_; - DataSource* _tmp11_; - DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; -#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = _object_it; + DataObject* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _object_it; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7066 "ViewCollection.c" +#line 6838 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = _object_it; + _tmp5_ = _object_it; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp6_; #line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = object; + _tmp7_ = object; #line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView)); + _tmp8_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView)); #line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - source = _tmp11_; -#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = source; -#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject)); -#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; + source = _tmp8_; #line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); + _tmp9_ = source; #line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 7090 "ViewCollection.c" - GeeList* _tmp16_; - GeeList* _tmp18_; - DataSource* _tmp19_; + if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject)), t)) { +#line 6856 "ViewCollection.c" + GeeList* _tmp10_; + GeeList* _tmp12_; + DataSource* _tmp13_; #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = sources; + _tmp10_ = sources; #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ == NULL) { -#line 7098 "ViewCollection.c" - GeeArrayList* _tmp17_; + if (_tmp10_ == NULL) { +#line 6864 "ViewCollection.c" + GeeArrayList* _tmp11_; #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp11_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sources); #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList); -#line 7106 "ViewCollection.c" + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_LIST, GeeList); +#line 6872 "ViewCollection.c" } #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = sources; + _tmp12_ = sources; #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = source; + _tmp13_ = source; #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); -#line 7114 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); +#line 6880 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 7120 "ViewCollection.c" +#line 6886 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 7124 "ViewCollection.c" +#line 6890 "ViewCollection.c" } #line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = sources; #line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7130 "ViewCollection.c" +#line 6896 "ViewCollection.c" } -GeeList* view_collection_get_selected_sources (ViewCollection* self) { +GeeList* +view_collection_get_selected_sources (ViewCollection* self) +{ GeeList* result = NULL; GeeList* sources = NULL; GeeArrayList* _tmp0_; gint count = 0; DataSet* _tmp1_; - gint _tmp2_; #line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7147,74 +6914,72 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->selected; #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_set_get_count (_tmp1_); -#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - count = _tmp2_; -#line 7153 "ViewCollection.c" + count = data_set_get_count (_tmp1_); +#line 6918 "ViewCollection.c" { gint ctr = 0; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 7158 "ViewCollection.c" +#line 6923 "ViewCollection.c" { - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = TRUE; + _tmp2_ = TRUE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7165 "ViewCollection.c" +#line 6930 "ViewCollection.c" + gint _tmp4_; gint _tmp5_; - gint _tmp6_; - GeeList* _tmp7_; - DataSet* _tmp8_; - gint _tmp9_; - DataObject* _tmp10_; - DataView* _tmp11_; + GeeList* _tmp6_; + DataSet* _tmp7_; + gint _tmp8_; + DataObject* _tmp9_; + DataView* _tmp10_; + DataSource* _tmp11_; DataSource* _tmp12_; - DataSource* _tmp13_; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp3_) { -#line 7177 "ViewCollection.c" - gint _tmp4_; + if (!_tmp2_) { +#line 6942 "ViewCollection.c" + gint _tmp3_; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = ctr; + _tmp3_ = ctr; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ctr = _tmp4_ + 1; -#line 7183 "ViewCollection.c" + ctr = _tmp3_ + 1; +#line 6948 "ViewCollection.c" } #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = FALSE; + _tmp2_ = FALSE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = ctr; + _tmp4_ = ctr; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = count; + _tmp5_ = count; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!(_tmp5_ < _tmp6_)) { + if (!(_tmp4_ < _tmp5_)) { #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7195 "ViewCollection.c" +#line 6960 "ViewCollection.c" } #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = sources; + _tmp6_ = sources; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->selected; + _tmp7_ = self->priv->selected; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = ctr; + _tmp8_ = ctr; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = data_set_get_at (_tmp8_, _tmp9_); + _tmp9_ = data_set_get_at (_tmp7_, _tmp8_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = data_view_get_source (_tmp11_); + _tmp11_ = data_view_get_source (_tmp10_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp12_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp11_); -#line 7217 "ViewCollection.c" + _g_object_unref0 (_tmp10_); +#line 6982 "ViewCollection.c" } } } @@ -7222,69 +6987,72 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { result = sources; #line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7225 "ViewCollection.c" +#line 6990 "ViewCollection.c" } -DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index) { +DataSource* +view_collection_get_selected_source_at (ViewCollection* self, + gint index) +{ DataSource* result = NULL; DataObject* object = NULL; DataSet* _tmp0_; - gint _tmp1_; - DataObject* _tmp2_; - DataSource* _tmp3_ = NULL; - DataObject* _tmp4_; + DataObject* _tmp1_; + DataSource* _tmp2_ = NULL; + DataObject* _tmp3_; #line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->selected; #line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = index; -#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = data_set_get_at (_tmp0_, _tmp1_); + _tmp1_ = data_set_get_at (_tmp0_, index); #line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - object = _tmp2_; + object = _tmp1_; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = object; + _tmp3_ = object; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp4_ != NULL) { -#line 7251 "ViewCollection.c" - DataObject* _tmp5_; - DataSource* _tmp6_; + if (_tmp3_ != NULL) { +#line 7016 "ViewCollection.c" + DataObject* _tmp4_; + DataSource* _tmp5_; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = object; + _tmp4_ = object; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView)); + _tmp5_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView)); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _tmp6_; -#line 7262 "ViewCollection.c" + _tmp2_ = _tmp5_; +#line 7027 "ViewCollection.c" } else { #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = NULL; -#line 7268 "ViewCollection.c" + _tmp2_ = NULL; +#line 7033 "ViewCollection.c" } #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp3_; + result = _tmp2_; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7276 "ViewCollection.c" +#line 7041 "ViewCollection.c" } -GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t) { +GeeList* +view_collection_get_selected_sources_of_type (ViewCollection* self, + GType t) +{ GeeList* result = NULL; GeeList* sources = NULL; #line 1183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sources = NULL; -#line 7287 "ViewCollection.c" +#line 7055 "ViewCollection.c" { GeeList* _view_list = NULL; GeeList* _tmp0_; @@ -7309,7 +7077,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy _view_index = -1; #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7312 "ViewCollection.c" +#line 7080 "ViewCollection.c" gint _tmp4_; gint _tmp5_; gint _tmp6_; @@ -7321,9 +7089,6 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy DataView* _tmp10_; DataSource* _tmp11_; DataSource* _tmp12_; - GType _tmp13_; - GType _tmp14_; - gboolean _tmp15_; #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _view_index; #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7336,7 +7101,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy if (!(_tmp5_ < _tmp6_)) { #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7339 "ViewCollection.c" +#line 7104 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = _view_list; @@ -7355,233 +7120,208 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy #line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = source; #line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject)); -#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = t; -#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); -#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp15_) { -#line 7365 "ViewCollection.c" - GeeList* _tmp16_; - GeeList* _tmp18_; - DataSource* _tmp19_; + if (g_type_is_a (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject)), t)) { +#line 7124 "ViewCollection.c" + GeeList* _tmp13_; + GeeList* _tmp15_; + DataSource* _tmp16_; #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = sources; + _tmp13_ = sources; #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp16_ == NULL) { -#line 7373 "ViewCollection.c" - GeeArrayList* _tmp17_; + if (_tmp13_ == NULL) { +#line 7132 "ViewCollection.c" + GeeArrayList* _tmp14_; #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sources); #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList); -#line 7381 "ViewCollection.c" + sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_LIST, GeeList); +#line 7140 "ViewCollection.c" } #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp18_ = sources; + _tmp15_ = sources; #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = source; + _tmp16_ = source; #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); -#line 7389 "ViewCollection.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection), _tmp16_); +#line 7148 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7395 "ViewCollection.c" +#line 7154 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_list); -#line 7399 "ViewCollection.c" +#line 7158 "ViewCollection.c" } #line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = sources; #line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7405 "ViewCollection.c" +#line 7164 "ViewCollection.c" } -gint view_collection_index_of_source (ViewCollection* self, DataSource* source) { +gint +view_collection_index_of_source (ViewCollection* self, + DataSource* source) +{ gint result = 0; DataView* view = NULL; - DataSource* _tmp0_; - DataView* _tmp1_; - gint _tmp2_ = 0; - DataView* _tmp3_; + DataView* _tmp0_; + gint _tmp1_ = 0; + DataView* _tmp2_; #line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0); #line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0); #line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = source; + _tmp0_ = view_collection_get_view_for_source (self, source); #line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view_collection_get_view_for_source (self, _tmp0_); -#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = _tmp1_; -#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = view; + view = _tmp0_; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp3_ != NULL) { -#line 7430 "ViewCollection.c" - DataView* _tmp4_; - gint _tmp5_; + _tmp2_ = view; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = view; + if (_tmp2_ != NULL) { +#line 7189 "ViewCollection.c" + DataView* _tmp3_; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); + _tmp3_ = view; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = _tmp5_; -#line 7439 "ViewCollection.c" + _tmp1_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); +#line 7195 "ViewCollection.c" } else { #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = -1; -#line 7443 "ViewCollection.c" + _tmp1_ = -1; +#line 7199 "ViewCollection.c" } #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp2_; + result = _tmp1_; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7451 "ViewCollection.c" +#line 7207 "ViewCollection.c" } -void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) { - gboolean _tmp0_; +void +view_collection_internal_notify_view_altered (ViewCollection* self, + DataView* view) +{ #line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp0_) { -#line 7465 "ViewCollection.c" - DataView* _tmp1_; - DataView* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; -#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { +#line 7221 "ViewCollection.c" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_item_view_altered (self, _tmp1_); -#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = view; + view_collection_notify_item_view_altered (self, view); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_views_altered (self, _tmp4_); + view_collection_notify_views_altered (self, _tmp1_); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp4_); -#line 7484 "ViewCollection.c" + _g_object_unref0 (_tmp1_); +#line 7234 "ViewCollection.c" } else { - GeeHashSet* _tmp5_; - GeeHashSet* _tmp7_; - DataView* _tmp8_; + GeeHashSet* _tmp2_; + GeeHashSet* _tmp4_; #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = self->priv->frozen_views_altered; + _tmp2_ = self->priv->frozen_views_altered; #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ == NULL) { -#line 7493 "ViewCollection.c" - GeeHashSet* _tmp6_; + if (_tmp2_ == NULL) { +#line 7242 "ViewCollection.c" + GeeHashSet* _tmp3_; #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_views_altered); #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->frozen_views_altered = _tmp6_; -#line 7501 "ViewCollection.c" + self->priv->frozen_views_altered = _tmp3_; +#line 7250 "ViewCollection.c" } #line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = self->priv->frozen_views_altered; -#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view; + _tmp4_ = self->priv->frozen_views_altered; #line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); -#line 7509 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), view); +#line 7256 "ViewCollection.c" } } -void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) { - gboolean _tmp0_; +void +view_collection_internal_notify_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); #line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp0_) { -#line 7524 "ViewCollection.c" - DataView* _tmp1_; - DataView* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; -#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = view; + if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection))) { +#line 7271 "ViewCollection.c" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_item_geometry_altered (self, _tmp1_); -#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = view; + view_collection_notify_item_geometry_altered (self, view); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_OBJECT, DataObject)); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_geometries_altered (self, _tmp4_); + view_collection_notify_geometries_altered (self, _tmp1_); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _g_object_unref0 (_tmp4_); -#line 7543 "ViewCollection.c" + _g_object_unref0 (_tmp1_); +#line 7284 "ViewCollection.c" } else { - GeeHashSet* _tmp5_; - GeeHashSet* _tmp7_; - DataView* _tmp8_; + GeeHashSet* _tmp2_; + GeeHashSet* _tmp4_; #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = self->priv->frozen_geometries_altered; + _tmp2_ = self->priv->frozen_geometries_altered; #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp5_ == NULL) { -#line 7552 "ViewCollection.c" - GeeHashSet* _tmp6_; + if (_tmp2_ == NULL) { +#line 7292 "ViewCollection.c" + GeeHashSet* _tmp3_; #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_geometries_altered); #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->priv->frozen_geometries_altered = _tmp6_; -#line 7560 "ViewCollection.c" + self->priv->frozen_geometries_altered = _tmp3_; +#line 7300 "ViewCollection.c" } #line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = self->priv->frozen_geometries_altered; + _tmp4_ = self->priv->frozen_geometries_altered; #line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = view; -#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); -#line 7568 "ViewCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), view); +#line 7306 "ViewCollection.c" } } -static void view_collection_real_notify_thawed (DataCollection* base) { +static void +view_collection_real_notify_thawed (DataCollection* base) +{ ViewCollection * self; GeeHashSet* _tmp0_; - GeeHashSet* _tmp9_; + GeeHashSet* _tmp8_; #line 1229 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->frozen_views_altered; #line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_ != NULL) { -#line 7583 "ViewCollection.c" - GeeHashSet* _tmp8_; +#line 7323 "ViewCollection.c" + GeeHashSet* _tmp7_; { GeeIterator* _view_it = NULL; GeeHashSet* _tmp1_; @@ -7594,220 +7334,252 @@ static void view_collection_real_notify_thawed (DataCollection* base) { _view_it = _tmp2_; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7597 "ViewCollection.c" +#line 7337 "ViewCollection.c" GeeIterator* _tmp3_; - gboolean _tmp4_; DataView* view = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataView* _tmp7_; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataView* _tmp6_; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = _view_it; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_iterator_next (_tmp3_); -#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp3_)) { #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7612 "ViewCollection.c" +#line 7349 "ViewCollection.c" } #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _view_it; + _tmp4_ = _view_it; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp6_; + view = (DataView*) _tmp5_; #line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = view; + _tmp6_ = view; #line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_item_view_altered (self, _tmp7_); + view_collection_notify_item_view_altered (self, _tmp6_); #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7626 "ViewCollection.c" +#line 7363 "ViewCollection.c" } #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 7630 "ViewCollection.c" +#line 7367 "ViewCollection.c" } #line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = self->priv->frozen_views_altered; + _tmp7_ = self->priv->frozen_views_altered; #line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_views_altered); #line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->frozen_views_altered = NULL; -#line 7640 "ViewCollection.c" +#line 7377 "ViewCollection.c" } #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = self->priv->frozen_geometries_altered; + _tmp8_ = self->priv->frozen_geometries_altered; #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (_tmp9_ != NULL) { -#line 7646 "ViewCollection.c" - GeeHashSet* _tmp17_; + if (_tmp8_ != NULL) { +#line 7383 "ViewCollection.c" + GeeHashSet* _tmp15_; { GeeIterator* _view_it = NULL; - GeeHashSet* _tmp10_; - GeeIterator* _tmp11_; + GeeHashSet* _tmp9_; + GeeIterator* _tmp10_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = self->priv->frozen_geometries_altered; + _tmp9_ = self->priv->frozen_geometries_altered; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp10_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _view_it = _tmp11_; + _view_it = _tmp10_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7660 "ViewCollection.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 7397 "ViewCollection.c" + GeeIterator* _tmp11_; DataView* view = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - DataView* _tmp16_; -#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = _view_it; + GeeIterator* _tmp12_; + gpointer _tmp13_; + DataView* _tmp14_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp11_ = _view_it; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp11_)) { #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7675 "ViewCollection.c" +#line 7409 "ViewCollection.c" } #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp14_ = _view_it; + _tmp12_ = _view_it; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view = (DataView*) _tmp15_; + view = (DataView*) _tmp13_; #line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp16_ = view; + _tmp14_ = view; #line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_item_geometry_altered (self, _tmp16_); + view_collection_notify_item_geometry_altered (self, _tmp14_); #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7689 "ViewCollection.c" +#line 7423 "ViewCollection.c" } #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 7693 "ViewCollection.c" +#line 7427 "ViewCollection.c" } #line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = self->priv->frozen_geometries_altered; + _tmp15_ = self->priv->frozen_geometries_altered; #line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_geometries_altered); #line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->frozen_geometries_altered = NULL; -#line 7703 "ViewCollection.c" +#line 7437 "ViewCollection.c" } #line 1244 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_thawed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 7707 "ViewCollection.c" +#line 7441 "ViewCollection.c" } -gboolean view_collection_are_items_filtered_out (ViewCollection* self) { +gboolean +view_collection_are_items_filtered_out (ViewCollection* self) +{ gboolean result = FALSE; - gint _tmp0_; - gint _tmp1_; #line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); -#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - result = _tmp0_ != _tmp1_; + result = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)) != data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7725 "ViewCollection.c" +#line 7455 "ViewCollection.c" } -static void view_collection_real_items_selected (ViewCollection* self, GeeIterable* selected) { +static void +view_collection_real_items_selected (ViewCollection* self, + GeeIterable* selected) +{ #line 75 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (selected)); -#line 7732 "ViewCollection.c" +#line 7465 "ViewCollection.c" } -static void view_collection_real_items_unselected (ViewCollection* self, GeeIterable* unselected) { +static void +view_collection_real_items_unselected (ViewCollection* self, + GeeIterable* unselected) +{ #line 79 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (unselected)); -#line 7739 "ViewCollection.c" +#line 7475 "ViewCollection.c" } -static void view_collection_real_items_state_changed (ViewCollection* self, GeeIterable* changed) { +static void +view_collection_real_items_state_changed (ViewCollection* self, + GeeIterable* changed) +{ #line 83 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (changed)); -#line 7746 "ViewCollection.c" +#line 7485 "ViewCollection.c" } -static void view_collection_real_selection_group_altered (ViewCollection* self) { +static void +view_collection_real_selection_group_altered (ViewCollection* self) +{ } -static void view_collection_real_items_shown (ViewCollection* self, GeeCollection* visible) { +static void +view_collection_real_items_shown (ViewCollection* self, + GeeCollection* visible) +{ #line 94 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (visible)); -#line 7757 "ViewCollection.c" +#line 7501 "ViewCollection.c" } -static void view_collection_real_items_hidden (ViewCollection* self, GeeCollection* hidden) { +static void +view_collection_real_items_hidden (ViewCollection* self, + GeeCollection* hidden) +{ #line 98 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (hidden)); -#line 7764 "ViewCollection.c" +#line 7511 "ViewCollection.c" } -static void view_collection_real_items_visibility_changed (ViewCollection* self, GeeCollection* changed) { +static void +view_collection_real_items_visibility_changed (ViewCollection* self, + GeeCollection* changed) +{ #line 102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (changed)); -#line 7771 "ViewCollection.c" +#line 7521 "ViewCollection.c" } -static void view_collection_real_item_view_altered (ViewCollection* self, DataView* view) { +static void +view_collection_real_item_view_altered (ViewCollection* self, + DataView* view) +{ #line 106 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); -#line 7778 "ViewCollection.c" +#line 7531 "ViewCollection.c" } -static void view_collection_real_item_geometry_altered (ViewCollection* self, DataView* view) { +static void +view_collection_real_item_geometry_altered (ViewCollection* self, + DataView* view) +{ #line 110 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_DATA_VIEW (view)); -#line 7785 "ViewCollection.c" +#line 7541 "ViewCollection.c" } -static void view_collection_real_views_altered (ViewCollection* self, GeeCollection* views) { +static void +view_collection_real_views_altered (ViewCollection* self, + GeeCollection* views) +{ #line 113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); -#line 7792 "ViewCollection.c" +#line 7551 "ViewCollection.c" } -static void view_collection_real_geometries_altered (ViewCollection* self, GeeCollection* views) { +static void +view_collection_real_geometries_altered (ViewCollection* self, + GeeCollection* views) +{ #line 116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (views)); -#line 7799 "ViewCollection.c" +#line 7561 "ViewCollection.c" } -static void view_collection_real_view_filter_installed (ViewCollection* self, ViewFilter* filer) { +static void +view_collection_real_view_filter_installed (ViewCollection* self, + ViewFilter* filer) +{ #line 119 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filer)); -#line 7806 "ViewCollection.c" +#line 7571 "ViewCollection.c" } -static void g_cclosure_user_marshal_VOID__VIEW_FILTER (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__VIEW_FILTER (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__VIEW_FILTER) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__VIEW_FILTER callback; register GCClosure * cc; @@ -7822,144 +7594,176 @@ static void g_cclosure_user_marshal_VOID__VIEW_FILTER (GClosure * closure, GValu data1 = closure->data; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data2 = param_values->data[0].v_pointer; -#line 7825 "ViewCollection.c" +#line 7597 "ViewCollection.c" } else { #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data1 = param_values->data[0].v_pointer; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data2 = closure->data; -#line 7831 "ViewCollection.c" +#line 7603 "ViewCollection.c" } #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" callback = (GMarshalFunc_VOID__VIEW_FILTER) (marshal_data ? marshal_data : cc->callback); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" callback (data1, value_get_view_filter (param_values + 1), data2); -#line 7837 "ViewCollection.c" +#line 7609 "ViewCollection.c" } -static void view_collection_real_view_filter_removed (ViewCollection* self, ViewFilter* filer) { +static void +view_collection_real_view_filter_removed (ViewCollection* self, + ViewFilter* filer) +{ #line 122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_FILTER (filer)); -#line 7844 "ViewCollection.c" +#line 7619 "ViewCollection.c" } -ViewCollectionMonitor* view_collection_monitor_construct (GType object_type) { +ViewCollectionMonitor* +view_collection_monitor_construct (GType object_type) +{ ViewCollectionMonitor* self = NULL; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewCollectionMonitor*) g_type_create_instance (object_type); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 7854 "ViewCollection.c" +#line 7631 "ViewCollection.c" } -ViewCollectionMonitor* view_collection_monitor_new (void) { +ViewCollectionMonitor* +view_collection_monitor_new (void) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_monitor_construct (VIEW_COLLECTION_TYPE_MONITOR); -#line 7861 "ViewCollection.c" +#line 7640 "ViewCollection.c" } -static void view_collection_value_monitor_init (GValue* value) { +static void +view_collection_value_monitor_init (GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 7868 "ViewCollection.c" +#line 7649 "ViewCollection.c" } -static void view_collection_value_monitor_free_value (GValue* value) { +static void +view_collection_value_monitor_free_value (GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_unref (value->data[0].v_pointer); -#line 7877 "ViewCollection.c" +#line 7660 "ViewCollection.c" } } -static void view_collection_value_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +view_collection_value_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (src_value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = view_collection_monitor_ref (src_value->data[0].v_pointer); -#line 7887 "ViewCollection.c" +#line 7673 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 7891 "ViewCollection.c" +#line 7677 "ViewCollection.c" } } -static gpointer view_collection_value_monitor_peek_pointer (const GValue* value) { +static gpointer +view_collection_value_monitor_peek_pointer (const GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 7899 "ViewCollection.c" +#line 7687 "ViewCollection.c" } -static gchar* view_collection_value_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +view_collection_value_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (collect_values[0].v_pointer) { -#line 7906 "ViewCollection.c" +#line 7699 "ViewCollection.c" ViewCollectionMonitor * object; object = collect_values[0].v_pointer; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (object->parent_instance.g_class == NULL) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7913 "ViewCollection.c" +#line 7706 "ViewCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.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 7917 "ViewCollection.c" +#line 7710 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_collection_monitor_ref (object); -#line 7921 "ViewCollection.c" +#line 7714 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 7925 "ViewCollection.c" +#line 7718 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 7929 "ViewCollection.c" +#line 7722 "ViewCollection.c" } -static gchar* view_collection_value_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +view_collection_value_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ViewCollectionMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!object_p) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7940 "ViewCollection.c" +#line 7738 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!value->data[0].v_pointer) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = NULL; -#line 7946 "ViewCollection.c" +#line 7744 "ViewCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = value->data[0].v_pointer; -#line 7950 "ViewCollection.c" +#line 7748 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_collection_monitor_ref (value->data[0].v_pointer); -#line 7954 "ViewCollection.c" +#line 7752 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 7958 "ViewCollection.c" +#line 7756 "ViewCollection.c" } -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ViewCollectionParamSpecMonitor* spec; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (g_type_is_a (object_type, VIEW_COLLECTION_TYPE_MONITOR), NULL); @@ -7969,20 +7773,25 @@ GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return G_PARAM_SPEC (spec); -#line 7972 "ViewCollection.c" +#line 7776 "ViewCollection.c" } -gpointer view_collection_value_get_monitor (const GValue* value) { +gpointer +view_collection_value_get_monitor (const GValue* value) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR), NULL); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 7981 "ViewCollection.c" +#line 7787 "ViewCollection.c" } -void view_collection_value_set_monitor (GValue* value, gpointer v_object) { +void +view_collection_value_set_monitor (GValue* value, + gpointer v_object) +{ ViewCollectionMonitor * old; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR)); @@ -7998,22 +7807,25 @@ void view_collection_value_set_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_ref (value->data[0].v_pointer); -#line 8001 "ViewCollection.c" +#line 7810 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8005 "ViewCollection.c" +#line 7814 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_unref (old); -#line 8011 "ViewCollection.c" +#line 7820 "ViewCollection.c" } } -void view_collection_value_take_monitor (GValue* value, gpointer v_object) { +void +view_collection_value_take_monitor (GValue* value, + gpointer v_object) +{ ViewCollectionMonitor * old; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIEW_COLLECTION_TYPE_MONITOR)); @@ -8027,48 +7839,56 @@ void view_collection_value_take_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = v_object; -#line 8030 "ViewCollection.c" +#line 7842 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8034 "ViewCollection.c" +#line 7846 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_unref (old); -#line 8040 "ViewCollection.c" +#line 7852 "ViewCollection.c" } } -static void view_collection_monitor_class_init (ViewCollectionMonitorClass * klass) { +static void +view_collection_monitor_class_init (ViewCollectionMonitorClass * klass) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_finalize; -#line 8050 "ViewCollection.c" +#line 7864 "ViewCollection.c" } -static void view_collection_monitor_instance_init (ViewCollectionMonitor * self) { +static void +view_collection_monitor_instance_init (ViewCollectionMonitor * self) +{ #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 8057 "ViewCollection.c" +#line 7873 "ViewCollection.c" } -static void view_collection_monitor_finalize (ViewCollectionMonitor * obj) { +static void +view_collection_monitor_finalize (ViewCollectionMonitor * obj) +{ ViewCollectionMonitor * self; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_destroy (self); -#line 8067 "ViewCollection.c" +#line 7885 "ViewCollection.c" } -GType view_collection_monitor_get_type (void) { +GType +view_collection_monitor_get_type (void) +{ static volatile gsize view_collection_monitor_type_id__volatile = 0; if (g_once_init_enter (&view_collection_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { view_collection_value_monitor_init, view_collection_value_monitor_free_value, view_collection_value_monitor_copy_value, view_collection_value_monitor_peek_pointer, "p", view_collection_value_monitor_collect_value, "p", view_collection_value_monitor_lcopy_value }; @@ -8082,18 +7902,22 @@ GType view_collection_monitor_get_type (void) { } -gpointer view_collection_monitor_ref (gpointer instance) { +gpointer +view_collection_monitor_ref (gpointer instance) +{ ViewCollectionMonitor * self; self = instance; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_atomic_int_inc (&self->ref_count); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return instance; -#line 8092 "ViewCollection.c" +#line 7914 "ViewCollection.c" } -void view_collection_monitor_unref (gpointer instance) { +void +view_collection_monitor_unref (gpointer instance) +{ ViewCollectionMonitor * self; self = instance; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8102,62 +7926,74 @@ void view_collection_monitor_unref (gpointer instance) { VIEW_COLLECTION_MONITOR_GET_CLASS (self)->finalize (self); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8105 "ViewCollection.c" +#line 7929 "ViewCollection.c" } } -static void _view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_view_collection_on_sources_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 44 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_sources_added ((ViewCollection*) self, _sender, added); -#line 8113 "ViewCollection.c" +#line 7941 "ViewCollection.c" } -static void _view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_view_collection_on_sources_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 45 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_sources_removed ((ViewCollection*) self, removed); -#line 8120 "ViewCollection.c" +#line 7952 "ViewCollection.c" } -static void _view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_view_collection_on_sources_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 46 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_on_sources_altered ((ViewCollection*) self, _sender, items); -#line 8127 "ViewCollection.c" +#line 7963 "ViewCollection.c" } -static gpointer _view_manager_ref0 (gpointer self) { +static gpointer +_view_manager_ref0 (gpointer self) +{ #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? view_manager_ref (self) : NULL; -#line 8134 "ViewCollection.c" +#line 7972 "ViewCollection.c" } -static gpointer _alteration_ref0 (gpointer self) { +static gpointer +_alteration_ref0 (gpointer self) +{ #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? alteration_ref (self) : NULL; -#line 8141 "ViewCollection.c" +#line 7981 "ViewCollection.c" } -static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) { +static ViewCollectionMonitorImpl* +view_collection_monitor_impl_construct (GType object_type, + ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq) +{ ViewCollectionMonitorImpl* self = NULL; ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - SourceCollection* _tmp2_; - SourceCollection* _tmp3_; - ViewManager* _tmp4_; - ViewManager* _tmp5_; - Alteration* _tmp6_; - Alteration* _tmp7_; - SourceCollection* _tmp8_; - ViewCollection* _tmp9_; - SourceCollection* _tmp10_; - ViewCollection* _tmp11_; - SourceCollection* _tmp12_; - ViewCollection* _tmp13_; + SourceCollection* _tmp1_; + ViewManager* _tmp2_; + Alteration* _tmp3_; #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (owner), NULL); #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8169,82 +8005,73 @@ static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewCollectionMonitorImpl*) view_collection_monitor_construct (object_type); #line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = owner; -#line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = _data_collection_ref0 (_tmp0_); + _tmp0_ = _data_collection_ref0 (owner); #line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->owner); #line 33 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->owner = _tmp1_; -#line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = sources; + self->owner = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = _data_collection_ref0 (_tmp2_); + _tmp1_ = _data_collection_ref0 (sources); #line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _data_collection_unref0 (self->sources); #line 34 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->sources = _tmp3_; + self->sources = _tmp1_; #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = manager; -#line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp5_ = _view_manager_ref0 (_tmp4_); + _tmp2_ = _view_manager_ref0 (manager); #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_manager_unref0 (self->manager); #line 35 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->manager = _tmp5_; -#line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = prereq; + self->manager = _tmp2_; #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp7_ = _alteration_ref0 (_tmp6_); + _tmp3_ = _alteration_ref0 (prereq); #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _alteration_unref0 (self->prereq); #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - self->prereq = _tmp7_; + self->prereq = _tmp3_; #line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp8_ = sources; -#line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp9_ = owner; -#line 38 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_sources_added_data_collection_items_added, _tmp9_); -#line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp10_ = sources; -#line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = owner; + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _view_collection_on_sources_added_data_collection_items_added, owner); #line 39 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_sources_removed_data_collection_items_removed, _tmp11_); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _view_collection_on_sources_removed_data_collection_items_removed, owner); #line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = sources; -#line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp13_ = owner; -#line 40 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _view_collection_on_sources_altered_data_collection_items_altered, _tmp13_); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _view_collection_on_sources_altered_data_collection_items_altered, owner); #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8223 "ViewCollection.c" +#line 8039 "ViewCollection.c" } -static ViewCollectionMonitorImpl* view_collection_monitor_impl_new (ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) { +static ViewCollectionMonitorImpl* +view_collection_monitor_impl_new (ViewCollection* owner, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq) +{ #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_monitor_impl_construct (VIEW_COLLECTION_TYPE_MONITOR_IMPL, owner, sources, manager, prereq); -#line 8230 "ViewCollection.c" +#line 8051 "ViewCollection.c" } -static void view_collection_monitor_impl_class_init (ViewCollectionMonitorImplClass * klass) { +static void +view_collection_monitor_impl_class_init (ViewCollectionMonitorImplClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_monitor_impl_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewCollectionMonitorClass *) klass)->finalize = view_collection_monitor_impl_finalize; -#line 8239 "ViewCollection.c" +#line 8062 "ViewCollection.c" } -static void view_collection_monitor_impl_instance_init (ViewCollectionMonitorImpl * self) { +static void +view_collection_monitor_impl_instance_init (ViewCollectionMonitorImpl * self) +{ } -static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) { +static void +view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) +{ ViewCollectionMonitorImpl * self; SourceCollection* _tmp0_; ViewCollection* _tmp1_; @@ -8291,11 +8118,13 @@ static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) _alteration_unref0 (self->prereq); #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" VIEW_COLLECTION_MONITOR_CLASS (view_collection_monitor_impl_parent_class)->finalize (obj); -#line 8294 "ViewCollection.c" +#line 8121 "ViewCollection.c" } -static GType view_collection_monitor_impl_get_type (void) { +static GType +view_collection_monitor_impl_get_type (void) +{ static volatile gsize view_collection_monitor_impl_type_id__volatile = 0; if (g_once_init_enter (&view_collection_monitor_impl_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionMonitorImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_monitor_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollectionMonitorImpl), 0, (GInstanceInitFunc) view_collection_monitor_impl_instance_init, NULL }; @@ -8307,33 +8136,41 @@ static GType view_collection_monitor_impl_get_type (void) { } -static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType object_type) { +static ViewCollectionToggleLists* +view_collection_toggle_lists_construct (GType object_type) +{ ViewCollectionToggleLists * self = NULL; #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewCollectionToggleLists*) g_object_new (object_type, NULL); #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8316 "ViewCollection.c" +#line 8147 "ViewCollection.c" } -static ViewCollectionToggleLists* view_collection_toggle_lists_new (void) { +static ViewCollectionToggleLists* +view_collection_toggle_lists_new (void) +{ #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return view_collection_toggle_lists_construct (VIEW_COLLECTION_TYPE_TOGGLE_LISTS); -#line 8323 "ViewCollection.c" +#line 8156 "ViewCollection.c" } -static void view_collection_toggle_lists_class_init (ViewCollectionToggleListsClass * klass) { +static void +view_collection_toggle_lists_class_init (ViewCollectionToggleListsClass * klass) +{ #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_toggle_lists_parent_class = g_type_class_peek_parent (klass); #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" G_OBJECT_CLASS (klass)->finalize = view_collection_toggle_lists_finalize; -#line 8332 "ViewCollection.c" +#line 8167 "ViewCollection.c" } -static void view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) { +static void +view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8344,11 +8181,13 @@ static void view_collection_toggle_lists_instance_init (ViewCollectionToggleList _tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 52 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->unselected = _tmp1_; -#line 8347 "ViewCollection.c" +#line 8184 "ViewCollection.c" } -static void view_collection_toggle_lists_finalize (GObject * obj) { +static void +view_collection_toggle_lists_finalize (GObject * obj) +{ ViewCollectionToggleLists * self; #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists); @@ -8358,11 +8197,13 @@ static void view_collection_toggle_lists_finalize (GObject * obj) { _g_object_unref0 (self->unselected); #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" G_OBJECT_CLASS (view_collection_toggle_lists_parent_class)->finalize (obj); -#line 8361 "ViewCollection.c" +#line 8200 "ViewCollection.c" } -static GType view_collection_toggle_lists_get_type (void) { +static GType +view_collection_toggle_lists_get_type (void) +{ static volatile gsize view_collection_toggle_lists_type_id__volatile = 0; if (g_once_init_enter (&view_collection_toggle_lists_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionToggleListsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_toggle_lists_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollectionToggleLists), 0, (GInstanceInitFunc) view_collection_toggle_lists_instance_init, NULL }; @@ -8374,7 +8215,9 @@ static GType view_collection_toggle_lists_get_type (void) { } -static void view_collection_class_init (ViewCollectionClass * klass) { +static void +view_collection_class_init (ViewCollectionClass * klass) +{ #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_parent_class = g_type_class_peek_parent (klass); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8497,11 +8340,13 @@ static void view_collection_class_init (ViewCollectionClass * klass) { view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL] = g_signal_new ("view-filter-installed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_installed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL] = g_signal_new ("view-filter-removed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, view_filter_removed), NULL, NULL, g_cclosure_user_marshal_VOID__VIEW_FILTER, G_TYPE_NONE, 1, TYPE_VIEW_FILTER); -#line 8500 "ViewCollection.c" +#line 8343 "ViewCollection.c" } -static void view_collection_instance_init (ViewCollection * self) { +static void +view_collection_instance_init (ViewCollection * self) +{ GeeHashMultiMap* _tmp0_; GeeHashSet* _tmp1_; DataSet* _tmp2_; @@ -8540,11 +8385,13 @@ static void view_collection_instance_init (ViewCollection * self) { _tmp3_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 72 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->source_map = _tmp3_; -#line 8543 "ViewCollection.c" +#line 8388 "ViewCollection.c" } -static void view_collection_finalize (DataCollection * obj) { +static void +view_collection_finalize (DataCollection * obj) +{ ViewCollection * self; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_COLLECTION, ViewCollection); @@ -8566,11 +8413,13 @@ static void view_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->source_map); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" DATA_COLLECTION_CLASS (view_collection_parent_class)->finalize (obj); -#line 8569 "ViewCollection.c" +#line 8416 "ViewCollection.c" } -GType view_collection_get_type (void) { +GType +view_collection_get_type (void) +{ static volatile gsize view_collection_type_id__volatile = 0; if (g_once_init_enter (&view_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ViewCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) view_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ViewCollection), 0, (GInstanceInitFunc) view_collection_instance_init, NULL }; @@ -8582,7 +8431,10 @@ GType view_collection_get_type (void) { } -static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source) { +static gboolean +view_manager_real_include_in_view (ViewManager* self, + DataSource* source) +{ gboolean result = FALSE; #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); @@ -8590,145 +8442,181 @@ static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource result = TRUE; #line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 8593 "ViewCollection.c" +#line 8445 "ViewCollection.c" } -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) { +gboolean +view_manager_include_in_view (ViewManager* self, + DataSource* source) +{ #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_MANAGER (self), FALSE); #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_MANAGER_GET_CLASS (self)->include_in_view (self, source); -#line 8602 "ViewCollection.c" +#line 8457 "ViewCollection.c" } -static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source) { +static DataView* +view_manager_real_create_view (ViewManager* self, + DataSource* source) +{ #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_critical ("Type `%s' does not implement abstract method `view_manager_create_view'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8611 "ViewCollection.c" +#line 8469 "ViewCollection.c" } -DataView* view_manager_create_view (ViewManager* self, DataSource* source) { +DataView* +view_manager_create_view (ViewManager* self, + DataSource* source) +{ #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_MANAGER (self), NULL); #line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_MANAGER_GET_CLASS (self)->create_view (self, source); -#line 8620 "ViewCollection.c" +#line 8481 "ViewCollection.c" } -ViewManager* view_manager_construct (GType object_type) { +ViewManager* +view_manager_construct (GType object_type) +{ ViewManager* self = NULL; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewManager*) g_type_create_instance (object_type); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8630 "ViewCollection.c" +#line 8493 "ViewCollection.c" } -static void value_view_manager_init (GValue* value) { +static void +value_view_manager_init (GValue* value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8637 "ViewCollection.c" +#line 8502 "ViewCollection.c" } -static void value_view_manager_free_value (GValue* value) { +static void +value_view_manager_free_value (GValue* value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (value->data[0].v_pointer) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_unref (value->data[0].v_pointer); -#line 8646 "ViewCollection.c" +#line 8513 "ViewCollection.c" } } -static void value_view_manager_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_view_manager_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (src_value->data[0].v_pointer) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = view_manager_ref (src_value->data[0].v_pointer); -#line 8656 "ViewCollection.c" +#line 8526 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 8660 "ViewCollection.c" +#line 8530 "ViewCollection.c" } } -static gpointer value_view_manager_peek_pointer (const GValue* value) { +static gpointer +value_view_manager_peek_pointer (const GValue* value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 8668 "ViewCollection.c" +#line 8540 "ViewCollection.c" } -static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_view_manager_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (collect_values[0].v_pointer) { -#line 8675 "ViewCollection.c" +#line 8552 "ViewCollection.c" ViewManager * object; object = collect_values[0].v_pointer; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (object->parent_instance.g_class == NULL) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8682 "ViewCollection.c" +#line 8559 "ViewCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.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 8686 "ViewCollection.c" +#line 8563 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_manager_ref (object); -#line 8690 "ViewCollection.c" +#line 8567 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8694 "ViewCollection.c" +#line 8571 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8698 "ViewCollection.c" +#line 8575 "ViewCollection.c" } -static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_view_manager_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ViewManager ** object_p; object_p = collect_values[0].v_pointer; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!object_p) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8709 "ViewCollection.c" +#line 8591 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!value->data[0].v_pointer) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = NULL; -#line 8715 "ViewCollection.c" +#line 8597 "ViewCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = value->data[0].v_pointer; -#line 8719 "ViewCollection.c" +#line 8601 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_manager_ref (value->data[0].v_pointer); -#line 8723 "ViewCollection.c" +#line 8605 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8727 "ViewCollection.c" +#line 8609 "ViewCollection.c" } -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecViewManager* spec; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_MANAGER), NULL); @@ -8738,20 +8626,25 @@ GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return G_PARAM_SPEC (spec); -#line 8741 "ViewCollection.c" +#line 8629 "ViewCollection.c" } -gpointer value_get_view_manager (const GValue* value) { +gpointer +value_get_view_manager (const GValue* value) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER), NULL); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 8750 "ViewCollection.c" +#line 8640 "ViewCollection.c" } -void value_set_view_manager (GValue* value, gpointer v_object) { +void +value_set_view_manager (GValue* value, + gpointer v_object) +{ ViewManager * old; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER)); @@ -8767,22 +8660,25 @@ void value_set_view_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_ref (value->data[0].v_pointer); -#line 8770 "ViewCollection.c" +#line 8663 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8774 "ViewCollection.c" +#line 8667 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_unref (old); -#line 8780 "ViewCollection.c" +#line 8673 "ViewCollection.c" } } -void value_take_view_manager (GValue* value, gpointer v_object) { +void +value_take_view_manager (GValue* value, + gpointer v_object) +{ ViewManager * old; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER)); @@ -8796,22 +8692,24 @@ void value_take_view_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = v_object; -#line 8799 "ViewCollection.c" +#line 8695 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8803 "ViewCollection.c" +#line 8699 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_unref (old); -#line 8809 "ViewCollection.c" +#line 8705 "ViewCollection.c" } } -static void view_manager_class_init (ViewManagerClass * klass) { +static void +view_manager_class_init (ViewManagerClass * klass) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_manager_parent_class = g_type_class_peek_parent (klass); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8820,28 +8718,34 @@ static void view_manager_class_init (ViewManagerClass * klass) { ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) view_manager_real_include_in_view; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) view_manager_real_create_view; -#line 8823 "ViewCollection.c" +#line 8721 "ViewCollection.c" } -static void view_manager_instance_init (ViewManager * self) { +static void +view_manager_instance_init (ViewManager * self) +{ #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 8830 "ViewCollection.c" +#line 8730 "ViewCollection.c" } -static void view_manager_finalize (ViewManager * obj) { +static void +view_manager_finalize (ViewManager * obj) +{ ViewManager * self; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_MANAGER, ViewManager); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_destroy (self); -#line 8840 "ViewCollection.c" +#line 8742 "ViewCollection.c" } -GType view_manager_get_type (void) { +GType +view_manager_get_type (void) +{ static volatile gsize view_manager_type_id__volatile = 0; if (g_once_init_enter (&view_manager_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_view_manager_init, value_view_manager_free_value, value_view_manager_copy_value, value_view_manager_peek_pointer, "p", value_view_manager_collect_value, "p", value_view_manager_lcopy_value }; @@ -8855,18 +8759,22 @@ GType view_manager_get_type (void) { } -gpointer view_manager_ref (gpointer instance) { +gpointer +view_manager_ref (gpointer instance) +{ ViewManager * self; self = instance; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_atomic_int_inc (&self->ref_count); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return instance; -#line 8865 "ViewCollection.c" +#line 8771 "ViewCollection.c" } -void view_manager_unref (gpointer instance) { +void +view_manager_unref (gpointer instance) +{ ViewManager * self; self = instance; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8875,142 +8783,177 @@ void view_manager_unref (gpointer instance) { VIEW_MANAGER_GET_CLASS (self)->finalize (self); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8878 "ViewCollection.c" +#line 8786 "ViewCollection.c" } } -static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) { +static gboolean +view_filter_real_predicate (ViewFilter* self, + DataView* view) +{ gboolean _tmp0_ = FALSE; #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_critical ("Type `%s' does not implement abstract method `view_filter_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return _tmp0_; -#line 8889 "ViewCollection.c" +#line 8800 "ViewCollection.c" } -gboolean view_filter_predicate (ViewFilter* self, DataView* view) { +gboolean +view_filter_predicate (ViewFilter* self, + DataView* view) +{ #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_FILTER (self), FALSE); #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_FILTER_GET_CLASS (self)->predicate (self, view); -#line 8898 "ViewCollection.c" +#line 8812 "ViewCollection.c" } -ViewFilter* view_filter_construct (GType object_type) { +ViewFilter* +view_filter_construct (GType object_type) +{ ViewFilter* self = NULL; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = (ViewFilter*) g_type_create_instance (object_type); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8908 "ViewCollection.c" +#line 8824 "ViewCollection.c" } -static void view_filter_real_refresh (ViewFilter* self) { +static void +view_filter_real_refresh (ViewFilter* self) +{ } -static void value_view_filter_init (GValue* value) { +static void +value_view_filter_init (GValue* value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8919 "ViewCollection.c" +#line 8839 "ViewCollection.c" } -static void value_view_filter_free_value (GValue* value) { +static void +value_view_filter_free_value (GValue* value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (value->data[0].v_pointer); -#line 8928 "ViewCollection.c" +#line 8850 "ViewCollection.c" } } -static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_view_filter_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (src_value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = view_filter_ref (src_value->data[0].v_pointer); -#line 8938 "ViewCollection.c" +#line 8863 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 8942 "ViewCollection.c" +#line 8867 "ViewCollection.c" } } -static gpointer value_view_filter_peek_pointer (const GValue* value) { +static gpointer +value_view_filter_peek_pointer (const GValue* value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 8950 "ViewCollection.c" +#line 8877 "ViewCollection.c" } -static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_view_filter_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (collect_values[0].v_pointer) { -#line 8957 "ViewCollection.c" +#line 8889 "ViewCollection.c" ViewFilter * object; object = collect_values[0].v_pointer; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (object->parent_instance.g_class == NULL) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8964 "ViewCollection.c" +#line 8896 "ViewCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.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 8968 "ViewCollection.c" +#line 8900 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_filter_ref (object); -#line 8972 "ViewCollection.c" +#line 8904 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8976 "ViewCollection.c" +#line 8908 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8980 "ViewCollection.c" +#line 8912 "ViewCollection.c" } -static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_view_filter_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ ViewFilter ** object_p; object_p = collect_values[0].v_pointer; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!object_p) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8991 "ViewCollection.c" +#line 8928 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = NULL; -#line 8997 "ViewCollection.c" +#line 8934 "ViewCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = value->data[0].v_pointer; -#line 9001 "ViewCollection.c" +#line 8938 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_filter_ref (value->data[0].v_pointer); -#line 9005 "ViewCollection.c" +#line 8942 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 9009 "ViewCollection.c" +#line 8946 "ViewCollection.c" } -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecViewFilter* spec; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_FILTER), NULL); @@ -9020,20 +8963,25 @@ GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return G_PARAM_SPEC (spec); -#line 9023 "ViewCollection.c" +#line 8966 "ViewCollection.c" } -gpointer value_get_view_filter (const GValue* value) { +gpointer +value_get_view_filter (const GValue* value) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER), NULL); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 9032 "ViewCollection.c" +#line 8977 "ViewCollection.c" } -void value_set_view_filter (GValue* value, gpointer v_object) { +void +value_set_view_filter (GValue* value, + gpointer v_object) +{ ViewFilter * old; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER)); @@ -9049,22 +8997,25 @@ void value_set_view_filter (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_ref (value->data[0].v_pointer); -#line 9052 "ViewCollection.c" +#line 9000 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9056 "ViewCollection.c" +#line 9004 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (old); -#line 9062 "ViewCollection.c" +#line 9010 "ViewCollection.c" } } -void value_take_view_filter (GValue* value, gpointer v_object) { +void +value_take_view_filter (GValue* value, + gpointer v_object) +{ ViewFilter * old; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER)); @@ -9078,22 +9029,24 @@ void value_take_view_filter (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = v_object; -#line 9081 "ViewCollection.c" +#line 9032 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9085 "ViewCollection.c" +#line 9036 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (old); -#line 9091 "ViewCollection.c" +#line 9042 "ViewCollection.c" } } -static void view_filter_class_init (ViewFilterClass * klass) { +static void +view_filter_class_init (ViewFilterClass * klass) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_parent_class = g_type_class_peek_parent (klass); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -9104,28 +9057,34 @@ static void view_filter_class_init (ViewFilterClass * klass) { ((ViewFilterClass *) klass)->refresh = view_filter_real_refresh; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_signals[VIEW_FILTER_REFRESH_SIGNAL] = g_signal_new ("refresh", TYPE_VIEW_FILTER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewFilterClass, refresh), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9107 "ViewCollection.c" +#line 9060 "ViewCollection.c" } -static void view_filter_instance_init (ViewFilter * self) { +static void +view_filter_instance_init (ViewFilter * self) +{ #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 9114 "ViewCollection.c" +#line 9069 "ViewCollection.c" } -static void view_filter_finalize (ViewFilter * obj) { +static void +view_filter_finalize (ViewFilter * obj) +{ ViewFilter * self; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_FILTER, ViewFilter); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_destroy (self); -#line 9124 "ViewCollection.c" +#line 9081 "ViewCollection.c" } -GType view_filter_get_type (void) { +GType +view_filter_get_type (void) +{ static volatile gsize view_filter_type_id__volatile = 0; if (g_once_init_enter (&view_filter_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_view_filter_init, value_view_filter_free_value, value_view_filter_copy_value, value_view_filter_peek_pointer, "p", value_view_filter_collect_value, "p", value_view_filter_lcopy_value }; @@ -9139,18 +9098,22 @@ GType view_filter_get_type (void) { } -gpointer view_filter_ref (gpointer instance) { +gpointer +view_filter_ref (gpointer instance) +{ ViewFilter * self; self = instance; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_atomic_int_inc (&self->ref_count); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return instance; -#line 9149 "ViewCollection.c" +#line 9110 "ViewCollection.c" } -void view_filter_unref (gpointer instance) { +void +view_filter_unref (gpointer instance) +{ ViewFilter * self; self = instance; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -9159,7 +9122,7 @@ void view_filter_unref (gpointer instance) { VIEW_FILTER_GET_CLASS (self)->finalize (self); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9162 "ViewCollection.c" +#line 9125 "ViewCollection.c" } } diff --git a/src/core/util.c b/src/core/util.c index f4143d3..2b9ace7 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.36.6, the Vala compiler +/* util.c generated by valac 0.40.4, the Vala compiler * generated from util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,6 +12,7 @@ /**/ /* This collection cannot be used to store null.*/ + #include #include #include @@ -32,6 +33,16 @@ typedef struct _SingletonCollection SingletonCollection; typedef struct _SingletonCollectionClass SingletonCollectionClass; typedef struct _SingletonCollectionPrivate SingletonCollectionPrivate; +enum { + SINGLETON_COLLECTION_0_PROPERTY, + SINGLETON_COLLECTION_G_TYPE, + SINGLETON_COLLECTION_G_DUP_FUNC, + SINGLETON_COLLECTION_G_DESTROY_FUNC, + SINGLETON_COLLECTION_READ_ONLY_PROPERTY, + SINGLETON_COLLECTION_SIZE_PROPERTY, + SINGLETON_COLLECTION_NUM_PROPERTIES +}; +static GParamSpec* singleton_collection_properties[SINGLETON_COLLECTION_NUM_PROPERTIES]; #define _g_destroy_func0(var) (((var == NULL) || (g_destroy_func == NULL)) ? NULL : (var = (g_destroy_func (var), NULL))) #define SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR (singleton_collection_singleton_iterator_get_type ()) @@ -44,6 +55,16 @@ typedef struct _SingletonCollectionPrivate SingletonCollectionPrivate; typedef struct _SingletonCollectionSingletonIterator SingletonCollectionSingletonIterator; typedef struct _SingletonCollectionSingletonIteratorClass SingletonCollectionSingletonIteratorClass; typedef struct _SingletonCollectionSingletonIteratorPrivate SingletonCollectionSingletonIteratorPrivate; +enum { + SINGLETON_COLLECTION_SINGLETON_ITERATOR_0_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_NUM_PROPERTIES +}; +static GParamSpec* singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_MARKER (marker_get_type ()) @@ -191,93 +212,140 @@ static gpointer aggregate_progress_monitor_parent_class = NULL; GType singleton_collection_get_type (void) G_GNUC_CONST; #define SINGLETON_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SINGLETON_COLLECTION, SingletonCollectionPrivate)) -enum { - SINGLETON_COLLECTION_DUMMY_PROPERTY, - SINGLETON_COLLECTION_G_TYPE, - SINGLETON_COLLECTION_G_DUP_FUNC, - SINGLETON_COLLECTION_G_DESTROY_FUNC, - SINGLETON_COLLECTION_READ_ONLY_PROPERTY, - SINGLETON_COLLECTION_SIZE_PROPERTY -}; -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); -static gboolean singleton_collection_real_add (GeeAbstractCollection* base, 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); +static gboolean singleton_collection_real_add (GeeAbstractCollection* base, + gconstpointer object); static void singleton_collection_real_clear (GeeAbstractCollection* base); -static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object); +static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, + gconstpointer object); static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base); -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c); -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c); +static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c); +static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c); static GType singleton_collection_singleton_iterator_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item); +static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, + gconstpointer item); #define SINGLETON_COLLECTION_SINGLETON_ITERATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIteratorPrivate)) -enum { - SINGLETON_COLLECTION_SINGLETON_ITERATOR_DUMMY_PROPERTY, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY -}; -static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target); +static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target); static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base); static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base); static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base); static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base); static void singleton_collection_singleton_iterator_finalize (GObject * obj); -static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); static void singleton_collection_finalize (GObject * obj); -static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_singleton_collection_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_singleton_collection_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType data_object_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; -void marker_mark (Marker* self, DataObject* object); -void marker_unmark (Marker* self, DataObject* object); -gboolean marker_toggle (Marker* self, DataObject* object); -void marker_mark_many (Marker* self, GeeCollection* list); -void marker_unmark_many (Marker* self, GeeCollection* list); +void marker_mark (Marker* self, + DataObject* object); +void marker_unmark (Marker* self, + DataObject* object); +gboolean marker_toggle (Marker* self, + DataObject* object); +void marker_mark_many (Marker* self, + GeeCollection* list); +void marker_unmark_many (Marker* self, + GeeCollection* list); void marker_mark_all (Marker* self); gint marker_get_count (Marker* self); GeeCollection* marker_get_all (Marker* self); gpointer unknown_total_monitor_ref (gpointer instance); void unknown_total_monitor_unref (gpointer instance); -GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_unknown_total_monitor (GValue* value, gpointer v_object); -void value_take_unknown_total_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_unknown_total_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_unknown_total_monitor (GValue* value, + gpointer v_object); +void value_take_unknown_total_monitor (GValue* value, + gpointer v_object); gpointer value_get_unknown_total_monitor (const GValue* value); GType unknown_total_monitor_get_type (void) G_GNUC_CONST; #define UNKNOWN_TOTAL_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitorPrivate)) -enum { - UNKNOWN_TOTAL_MONITOR_DUMMY_PROPERTY -}; -UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total); +UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, + guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, + guint64 count, + guint64 total); static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj); gpointer aggregate_progress_monitor_ref (gpointer instance); void aggregate_progress_monitor_unref (gpointer instance); -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object); -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object); +void value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object); gpointer value_get_aggregate_progress_monitor (const GValue* value); GType aggregate_progress_monitor_get_type (void) G_GNUC_CONST; #define AGGREGATE_PROGRESS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitorPrivate)) -enum { - AGGREGATE_PROGRESS_MONITOR_DUMMY_PROPERTY -}; -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name); -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total); +AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, + const gchar* name); +gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total); static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj); -gboolean null_progress_monitor (guint64 count, guint64 total); +gboolean null_progress_monitor (guint64 count, + guint64 total); gdouble degrees_to_radians (gdouble theta); -SingletonCollection* singleton_collection_construct (GType object_type, 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 * self = NULL; - gconstpointer _tmp0_; - gpointer _tmp1_; + gpointer _tmp0_; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func); #line 65 "/home/jens/Source/shotwell/src/core/util.vala" @@ -287,27 +355,33 @@ SingletonCollection* singleton_collection_construct (GType object_type, GType g_ #line 65 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->g_destroy_func = g_destroy_func; #line 66 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = object; -#line 66 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = ((_tmp0_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp0_) : ((gpointer) _tmp0_); + _tmp0_ = ((object != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) object) : ((gpointer) object); #line 66 "/home/jens/Source/shotwell/src/core/util.vala" _g_destroy_func0 (self->priv->object); #line 66 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->object = _tmp1_; + self->priv->object = _tmp0_; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 300 "util.c" +#line 366 "util.c" } -SingletonCollection* singleton_collection_new (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) +{ #line 65 "/home/jens/Source/shotwell/src/core/util.vala" return singleton_collection_construct (TYPE_SINGLETON_COLLECTION, g_type, g_dup_func, g_destroy_func, object); -#line 307 "util.c" +#line 378 "util.c" } -static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gconstpointer object) { +static gboolean +singleton_collection_real_add (GeeAbstractCollection* base, + gconstpointer object) +{ SingletonCollection * self; gboolean result = FALSE; #line 73 "/home/jens/Source/shotwell/src/core/util.vala" @@ -318,11 +392,13 @@ static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gcon result = FALSE; #line 76 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 322 "util.c" +#line 396 "util.c" } -static void singleton_collection_real_clear (GeeAbstractCollection* base) { +static void +singleton_collection_real_clear (GeeAbstractCollection* base) +{ SingletonCollection * self; #line 79 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); @@ -330,30 +406,32 @@ static void singleton_collection_real_clear (GeeAbstractCollection* base) { ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 80 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->object = NULL; -#line 334 "util.c" +#line 410 "util.c" } -static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object) { +static gboolean +singleton_collection_real_contains (GeeAbstractCollection* base, + gconstpointer object) +{ SingletonCollection * self; gboolean result = FALSE; gconstpointer _tmp0_; - gconstpointer _tmp1_; #line 83 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 84 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = self->priv->object; #line 84 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = object; -#line 84 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp0_ == _tmp1_; + result = _tmp0_ == object; #line 84 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 353 "util.c" +#line 429 "util.c" } -static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base) { +static GeeIterator* +singleton_collection_real_iterator (GeeAbstractCollection* base) +{ SingletonCollection * self; GeeIterator* result = NULL; SingletonCollectionSingletonIterator* _tmp0_; @@ -365,23 +443,23 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERATOR, GeeIterator); #line 88 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 369 "util.c" +#line 447 "util.c" } -static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item) { +static gboolean +singleton_collection_real_remove (GeeAbstractCollection* base, + gconstpointer item) +{ SingletonCollection * self; gboolean result = FALSE; gconstpointer _tmp0_; - gconstpointer _tmp1_; #line 91 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 92 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = item; -#line 92 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->object; + _tmp0_ = self->priv->object; #line 92 "/home/jens/Source/shotwell/src/core/util.vala" - if (_tmp0_ == _tmp1_) { + if (item == _tmp0_) { #line 93 "/home/jens/Source/shotwell/src/core/util.vala" ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 93 "/home/jens/Source/shotwell/src/core/util.vala" @@ -390,17 +468,19 @@ static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, g result = TRUE; #line 95 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 394 "util.c" +#line 472 "util.c" } #line 98 "/home/jens/Source/shotwell/src/core/util.vala" result = FALSE; #line 98 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 400 "util.c" +#line 478 "util.c" } -static gboolean singleton_collection_real_get_read_only (GeeAbstractCollection* base) { +static gboolean +singleton_collection_real_get_read_only (GeeAbstractCollection* base) +{ gboolean result; SingletonCollection* self; #line 70 "/home/jens/Source/shotwell/src/core/util.vala" @@ -409,11 +489,13 @@ static gboolean singleton_collection_real_get_read_only (GeeAbstractCollection* result = FALSE; #line 70 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 413 "util.c" +#line 493 "util.c" } -static gint singleton_collection_real_get_size (GeeAbstractCollection* base) { +static gint +singleton_collection_real_get_size (GeeAbstractCollection* base) +{ gint result; SingletonCollection* self; gint _tmp0_ = 0; @@ -426,31 +508,38 @@ static gint singleton_collection_real_get_size (GeeAbstractCollection* base) { if (_tmp1_ != NULL) { #line 103 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = 1; -#line 430 "util.c" +#line 512 "util.c" } else { #line 103 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = 0; -#line 434 "util.c" +#line 516 "util.c" } #line 103 "/home/jens/Source/shotwell/src/core/util.vala" result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 440 "util.c" +#line 522 "util.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 20 "/home/jens/Source/shotwell/src/core/util.vala" return self ? g_object_ref (self) : NULL; -#line 447 "util.c" +#line 531 "util.c" } -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) { +static SingletonCollectionSingletonIterator* +singleton_collection_singleton_iterator_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c) +{ SingletonCollectionSingletonIterator * self = NULL; SingletonCollection* _tmp0_; - SingletonCollection* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_SINGLETON_COLLECTION (c), NULL); #line 19 "/home/jens/Source/shotwell/src/core/util.vala" @@ -462,58 +551,58 @@ static SingletonCollectionSingletonIterator* singleton_collection_singleton_iter #line 19 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->g_destroy_func = g_destroy_func; #line 20 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = c; -#line 20 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (c); #line 20 "/home/jens/Source/shotwell/src/core/util.vala" _g_object_unref0 (self->priv->c); #line 20 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->c = _tmp1_; + self->priv->c = _tmp0_; #line 19 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 475 "util.c" +#line 562 "util.c" } -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) { +static SingletonCollectionSingletonIterator* +singleton_collection_singleton_iterator_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c) +{ #line 19 "/home/jens/Source/shotwell/src/core/util.vala" return singleton_collection_singleton_iterator_construct (SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, g_type, g_dup_func, g_destroy_func, c); -#line 482 "util.c" +#line 574 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) { +static gboolean +singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; - GeeForallFunc _tmp0_; - void* _tmp0__target; - SingletonCollection* _tmp1_; - gconstpointer _tmp2_; - gpointer _tmp3_; - gboolean _tmp4_; + SingletonCollection* _tmp0_; + gconstpointer _tmp1_; + gpointer _tmp2_; #line 31 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = f; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0__target = f_target; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->c; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = _tmp1_->priv->object; + _tmp0_ = self->priv->c; #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = ((_tmp2_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp2_) : ((gpointer) _tmp2_); + _tmp1_ = _tmp0_->priv->object; #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = _tmp0_ (_tmp3_, _tmp0__target); + _tmp2_ = ((_tmp1_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp1_) : ((gpointer) _tmp1_); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp4_; + result = f (_tmp2_, f_target); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 513 "util.c" +#line 600 "util.c" } -static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base) { +static gpointer +singleton_collection_singleton_iterator_real_get (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gpointer result = NULL; gconstpointer _tmp0_; @@ -528,11 +617,13 @@ static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* b result = _tmp1_; #line 36 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 532 "util.c" +#line 621 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_has_next (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; #line 39 "/home/jens/Source/shotwell/src/core/util.vala" @@ -541,11 +632,13 @@ static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterat result = FALSE; #line 40 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 545 "util.c" +#line 636 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_next (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; gboolean _tmp0_; @@ -562,7 +655,7 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* result = FALSE; #line 45 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 566 "util.c" +#line 659 "util.c" } #line 47 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = TRUE; @@ -580,11 +673,13 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* result = TRUE; #line 50 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 584 "util.c" +#line 677 "util.c" } -static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base) { +static void +singleton_collection_singleton_iterator_real_remove (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean _tmp0_; #line 53 "/home/jens/Source/shotwell/src/core/util.vala" @@ -593,7 +688,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba _tmp0_ = self->priv->done; #line 54 "/home/jens/Source/shotwell/src/core/util.vala" if (!_tmp0_) { -#line 597 "util.c" +#line 692 "util.c" SingletonCollection* _tmp1_; #line 55 "/home/jens/Source/shotwell/src/core/util.vala" _tmp1_ = self->priv->c; @@ -605,15 +700,17 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba ((self->priv->current == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->current = (self->priv->g_destroy_func (self->priv->current), NULL)); #line 56 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->current = NULL; -#line 609 "util.c" +#line 704 "util.c" } #line 59 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = TRUE; -#line 613 "util.c" +#line 708 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) +{ gboolean result; SingletonCollectionSingletonIterator* self; gboolean _tmp0_; @@ -625,11 +722,13 @@ static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeI result = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 629 "util.c" +#line 726 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) +{ gboolean result; SingletonCollectionSingletonIterator* self; gboolean _tmp0_; @@ -641,11 +740,13 @@ static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeItera result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 645 "util.c" +#line 744 "util.c" } -static void singleton_collection_singleton_iterator_class_init (SingletonCollectionSingletonIteratorClass * klass) { +static void +singleton_collection_singleton_iterator_class_init (SingletonCollectionSingletonIteratorClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -657,41 +758,49 @@ static void singleton_collection_singleton_iterator_class_init (SingletonCollect #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (klass)->finalize = singleton_collection_singleton_iterator_finalize; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 670 "util.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY] = g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 771 "util.c" } -static GType singleton_collection_singleton_iterator_gee_traversable_get_g_type (SingletonCollectionSingletonIterator* self) { +static GType +singleton_collection_singleton_iterator_gee_traversable_get_g_type (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_type; -#line 677 "util.c" +#line 780 "util.c" } -static GBoxedCopyFunc singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func (SingletonCollectionSingletonIterator* self) { +static GBoxedCopyFunc +singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_dup_func; -#line 684 "util.c" +#line 789 "util.c" } -static GDestroyNotify singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func (SingletonCollectionSingletonIterator* self) { +static GDestroyNotify +singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_destroy_func; -#line 691 "util.c" +#line 798 "util.c" } -static void singleton_collection_singleton_iterator_gee_traversable_interface_init (GeeTraversableIface * iface) { +static void +singleton_collection_singleton_iterator_gee_traversable_interface_init (GeeTraversableIface * iface) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_gee_traversable_parent_iface = g_type_interface_peek_parent (iface); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -702,11 +811,13 @@ static void singleton_collection_singleton_iterator_gee_traversable_interface_in iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func; -#line 706 "util.c" +#line 815 "util.c" } -static void singleton_collection_singleton_iterator_gee_iterator_interface_init (GeeIteratorIface * iface) { +static void +singleton_collection_singleton_iterator_gee_iterator_interface_init (GeeIteratorIface * iface) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_gee_iterator_parent_iface = g_type_interface_peek_parent (iface); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -721,22 +832,26 @@ static void singleton_collection_singleton_iterator_gee_iterator_interface_init iface->get_read_only = singleton_collection_singleton_iterator_real_get_read_only; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" iface->get_valid = singleton_collection_singleton_iterator_real_get_valid; -#line 725 "util.c" +#line 836 "util.c" } -static void singleton_collection_singleton_iterator_instance_init (SingletonCollectionSingletonIterator * self) { +static void +singleton_collection_singleton_iterator_instance_init (SingletonCollectionSingletonIterator * self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = SINGLETON_COLLECTION_SINGLETON_ITERATOR_GET_PRIVATE (self); #line 16 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = FALSE; #line 17 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->current = NULL; -#line 736 "util.c" +#line 849 "util.c" } -static void singleton_collection_singleton_iterator_finalize (GObject * obj) { +static void +singleton_collection_singleton_iterator_finalize (GObject * obj) +{ SingletonCollectionSingletonIterator * self; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); @@ -746,11 +861,13 @@ static void singleton_collection_singleton_iterator_finalize (GObject * obj) { ((self->priv->current == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->current = (self->priv->g_destroy_func (self->priv->current), NULL)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (singleton_collection_singleton_iterator_parent_class)->finalize (obj); -#line 750 "util.c" +#line 865 "util.c" } -static GType singleton_collection_singleton_iterator_get_type (void) { +static GType +singleton_collection_singleton_iterator_get_type (void) +{ static volatile gsize singleton_collection_singleton_iterator_type_id__volatile = 0; if (g_once_init_enter (&singleton_collection_singleton_iterator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SingletonCollectionSingletonIteratorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) singleton_collection_singleton_iterator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SingletonCollectionSingletonIterator), 0, (GInstanceInitFunc) singleton_collection_singleton_iterator_instance_init, NULL }; @@ -766,7 +883,12 @@ static GType singleton_collection_singleton_iterator_get_type (void) { } -static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_singleton_iterator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SingletonCollectionSingletonIterator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -783,18 +905,23 @@ static void _vala_singleton_collection_singleton_iterator_get_property (GObject g_value_set_boolean (value, gee_iterator_get_valid (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator))); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 787 "util.c" +#line 909 "util.c" default: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 793 "util.c" +#line 915 "util.c" } } -static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_singleton_iterator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SingletonCollectionSingletonIterator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -817,18 +944,20 @@ static void _vala_singleton_collection_singleton_iterator_set_property (GObject self->priv->g_destroy_func = g_value_get_pointer (value); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 821 "util.c" +#line 948 "util.c" default: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 827 "util.c" +#line 954 "util.c" } } -static void singleton_collection_class_init (SingletonCollectionClass * klass) { +static void +singleton_collection_class_init (SingletonCollectionClass * klass) +{ #line 13 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_parent_class = g_type_class_peek_parent (klass); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -854,27 +983,31 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) { #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (klass)->finalize = singleton_collection_finalize; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, singleton_collection_properties[SINGLETON_COLLECTION_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 867 "util.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, singleton_collection_properties[SINGLETON_COLLECTION_SIZE_PROPERTY] = g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 996 "util.c" } -static void singleton_collection_instance_init (SingletonCollection * self) { +static void +singleton_collection_instance_init (SingletonCollection * self) +{ #line 13 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = SINGLETON_COLLECTION_GET_PRIVATE (self); -#line 874 "util.c" +#line 1005 "util.c" } -static void singleton_collection_finalize (GObject * obj) { +static void +singleton_collection_finalize (GObject * obj) +{ SingletonCollection * self; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLETON_COLLECTION, SingletonCollection); @@ -882,11 +1015,13 @@ static void singleton_collection_finalize (GObject * obj) { ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (singleton_collection_parent_class)->finalize (obj); -#line 886 "util.c" +#line 1019 "util.c" } -GType singleton_collection_get_type (void) { +GType +singleton_collection_get_type (void) +{ static volatile gsize singleton_collection_type_id__volatile = 0; if (g_once_init_enter (&singleton_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SingletonCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) singleton_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SingletonCollection), 0, (GInstanceInitFunc) singleton_collection_instance_init, NULL }; @@ -898,7 +1033,12 @@ GType singleton_collection_get_type (void) { } -static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SingletonCollection * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -915,18 +1055,23 @@ static void _vala_singleton_collection_get_property (GObject * object, guint pro g_value_set_int (value, gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection))); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 919 "util.c" +#line 1059 "util.c" default: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 925 "util.c" +#line 1065 "util.c" } } -static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SingletonCollection * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -949,102 +1094,127 @@ static void _vala_singleton_collection_set_property (GObject * object, guint pro self->priv->g_destroy_func = g_value_get_pointer (value); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 953 "util.c" +#line 1098 "util.c" default: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 959 "util.c" +#line 1104 "util.c" } } -void marker_mark (Marker* self, DataObject* object) { +void +marker_mark (Marker* self, + DataObject* object) +{ #line 113 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 113 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark (self, object); -#line 969 "util.c" +#line 1117 "util.c" } -void marker_unmark (Marker* self, DataObject* object) { +void +marker_unmark (Marker* self, + DataObject* object) +{ #line 115 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 115 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->unmark (self, object); -#line 978 "util.c" +#line 1129 "util.c" } -gboolean marker_toggle (Marker* self, DataObject* object) { +gboolean +marker_toggle (Marker* self, + DataObject* object) +{ #line 117 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), FALSE); #line 117 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->toggle (self, object); -#line 987 "util.c" +#line 1141 "util.c" } -void marker_mark_many (Marker* self, GeeCollection* list) { +void +marker_mark_many (Marker* self, + GeeCollection* list) +{ #line 119 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 119 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark_many (self, list); -#line 996 "util.c" +#line 1153 "util.c" } -void marker_unmark_many (Marker* self, GeeCollection* list) { +void +marker_unmark_many (Marker* self, + GeeCollection* list) +{ #line 121 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 121 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->unmark_many (self, list); -#line 1005 "util.c" +#line 1165 "util.c" } -void marker_mark_all (Marker* self) { +void +marker_mark_all (Marker* self) +{ #line 123 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 123 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark_all (self); -#line 1014 "util.c" +#line 1176 "util.c" } -gint marker_get_count (Marker* self) { +gint +marker_get_count (Marker* self) +{ #line 127 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), 0); #line 127 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->get_count (self); -#line 1023 "util.c" +#line 1187 "util.c" } -GeeCollection* marker_get_all (Marker* self) { +GeeCollection* +marker_get_all (Marker* self) +{ #line 130 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), NULL); #line 130 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->get_all (self); -#line 1032 "util.c" +#line 1198 "util.c" } -static void marker_base_init (MarkerIface * iface) { +static void +marker_base_init (MarkerIface * iface) +{ #line 112 "/home/jens/Source/shotwell/src/core/util.vala" static gboolean initialized = FALSE; #line 112 "/home/jens/Source/shotwell/src/core/util.vala" if (!initialized) { #line 112 "/home/jens/Source/shotwell/src/core/util.vala" initialized = TRUE; -#line 1043 "util.c" +#line 1211 "util.c" } } -GType marker_get_type (void) { +GType +marker_get_type (void) +{ static volatile gsize marker_type_id__volatile = 0; if (g_once_init_enter (&marker_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MarkerIface), (GBaseInitFunc) marker_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1057,45 +1227,47 @@ GType marker_get_type (void) { } -UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +UnknownTotalMonitor* +unknown_total_monitor_construct (GType object_type, + guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ UnknownTotalMonitor* self = NULL; - guint64 _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; #line 147 "/home/jens/Source/shotwell/src/core/util.vala" self = (UnknownTotalMonitor*) g_type_create_instance (object_type); #line 148 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = total; -#line 148 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->total = _tmp0_; + self->priv->total = total; #line 149 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = wrapped_monitor; + self->priv->wrapped_monitor = wrapped_monitor; #line 149 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1__target = wrapped_monitor_target; -#line 149 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor = _tmp1_; -#line 149 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor_target = _tmp1__target; + self->priv->wrapped_monitor_target = wrapped_monitor_target; #line 147 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 1082 "util.c" +#line 1248 "util.c" } -UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +UnknownTotalMonitor* +unknown_total_monitor_new (guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ #line 147 "/home/jens/Source/shotwell/src/core/util.vala" return unknown_total_monitor_construct (TYPE_UNKNOWN_TOTAL_MONITOR, total, wrapped_monitor, wrapped_monitor_target); -#line 1089 "util.c" +#line 1259 "util.c" } -gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total) { +gboolean +unknown_total_monitor_monitor (UnknownTotalMonitor* self, + guint64 count, + guint64 total) +{ gboolean result = FALSE; ProgressMonitor _tmp0_; void* _tmp0__target; guint64 _tmp1_; - guint64 _tmp2_; - gboolean _tmp3_; #line 152 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_UNKNOWN_TOTAL_MONITOR (self), FALSE); #line 153 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1103,117 +1275,138 @@ gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count #line 153 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0__target = self->priv->wrapped_monitor_target; #line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = count; -#line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = self->priv->total; + _tmp1_ = self->priv->total; #line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = _tmp0_ (_tmp1_, _tmp2_, TRUE, _tmp0__target); -#line 153 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp3_; + result = _tmp0_ (count, _tmp1_, TRUE, _tmp0__target); #line 153 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1116 "util.c" +#line 1284 "util.c" } -static void value_unknown_total_monitor_init (GValue* value) { +static void +value_unknown_total_monitor_init (GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1123 "util.c" +#line 1293 "util.c" } -static void value_unknown_total_monitor_free_value (GValue* value) { +static void +value_unknown_total_monitor_free_value (GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (value->data[0].v_pointer); -#line 1132 "util.c" +#line 1304 "util.c" } } -static void value_unknown_total_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_unknown_total_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (src_value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = unknown_total_monitor_ref (src_value->data[0].v_pointer); -#line 1142 "util.c" +#line 1317 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = NULL; -#line 1146 "util.c" +#line 1321 "util.c" } } -static gpointer value_unknown_total_monitor_peek_pointer (const GValue* value) { +static gpointer +value_unknown_total_monitor_peek_pointer (const GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1154 "util.c" +#line 1331 "util.c" } -static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_unknown_total_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { -#line 1161 "util.c" +#line 1343 "util.c" UnknownTotalMonitor * object; object = collect_values[0].v_pointer; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (object->parent_instance.g_class == NULL) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1168 "util.c" +#line 1350 "util.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 143 "/home/jens/Source/shotwell/src/core/util.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 1172 "util.c" +#line 1354 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = unknown_total_monitor_ref (object); -#line 1176 "util.c" +#line 1358 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1180 "util.c" +#line 1362 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1184 "util.c" +#line 1366 "util.c" } -static gchar* value_unknown_total_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_unknown_total_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ UnknownTotalMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1195 "util.c" +#line 1382 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (!value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = NULL; -#line 1201 "util.c" +#line 1388 "util.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = value->data[0].v_pointer; -#line 1205 "util.c" +#line 1392 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = unknown_total_monitor_ref (value->data[0].v_pointer); -#line 1209 "util.c" +#line 1396 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1213 "util.c" +#line 1400 "util.c" } -GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_unknown_total_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecUnknownTotalMonitor* spec; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_UNKNOWN_TOTAL_MONITOR), NULL); @@ -1223,20 +1416,25 @@ GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return G_PARAM_SPEC (spec); -#line 1227 "util.c" +#line 1420 "util.c" } -gpointer value_get_unknown_total_monitor (const GValue* value) { +gpointer +value_get_unknown_total_monitor (const GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR), NULL); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1236 "util.c" +#line 1431 "util.c" } -void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { +void +value_set_unknown_total_monitor (GValue* value, + gpointer v_object) +{ UnknownTotalMonitor * old; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR)); @@ -1252,22 +1450,25 @@ void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_ref (value->data[0].v_pointer); -#line 1256 "util.c" +#line 1454 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1260 "util.c" +#line 1458 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (old); -#line 1266 "util.c" +#line 1464 "util.c" } } -void value_take_unknown_total_monitor (GValue* value, gpointer v_object) { +void +value_take_unknown_total_monitor (GValue* value, + gpointer v_object) +{ UnknownTotalMonitor * old; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR)); @@ -1281,52 +1482,60 @@ void value_take_unknown_total_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = v_object; -#line 1285 "util.c" +#line 1486 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1289 "util.c" +#line 1490 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (old); -#line 1295 "util.c" +#line 1496 "util.c" } } -static void unknown_total_monitor_class_init (UnknownTotalMonitorClass * klass) { +static void +unknown_total_monitor_class_init (UnknownTotalMonitorClass * klass) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_parent_class = g_type_class_peek_parent (klass); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" ((UnknownTotalMonitorClass *) klass)->finalize = unknown_total_monitor_finalize; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (UnknownTotalMonitorPrivate)); -#line 1307 "util.c" +#line 1510 "util.c" } -static void unknown_total_monitor_instance_init (UnknownTotalMonitor * self) { +static void +unknown_total_monitor_instance_init (UnknownTotalMonitor * self) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = UNKNOWN_TOTAL_MONITOR_GET_PRIVATE (self); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self->ref_count = 1; -#line 1316 "util.c" +#line 1521 "util.c" } -static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj) { +static void +unknown_total_monitor_finalize (UnknownTotalMonitor * obj) +{ UnknownTotalMonitor * self; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitor); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_signal_handlers_destroy (self); -#line 1326 "util.c" +#line 1533 "util.c" } -GType unknown_total_monitor_get_type (void) { +GType +unknown_total_monitor_get_type (void) +{ static volatile gsize unknown_total_monitor_type_id__volatile = 0; if (g_once_init_enter (&unknown_total_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_unknown_total_monitor_init, value_unknown_total_monitor_free_value, value_unknown_total_monitor_copy_value, value_unknown_total_monitor_peek_pointer, "p", value_unknown_total_monitor_collect_value, "p", value_unknown_total_monitor_lcopy_value }; @@ -1340,18 +1549,22 @@ GType unknown_total_monitor_get_type (void) { } -gpointer unknown_total_monitor_ref (gpointer instance) { +gpointer +unknown_total_monitor_ref (gpointer instance) +{ UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return instance; -#line 1351 "util.c" +#line 1562 "util.c" } -void unknown_total_monitor_unref (gpointer instance) { +void +unknown_total_monitor_unref (gpointer instance) +{ UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1360,256 +1573,273 @@ void unknown_total_monitor_unref (gpointer instance) { UNKNOWN_TOTAL_MONITOR_GET_CLASS (self)->finalize (self); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1364 "util.c" +#line 1577 "util.c" } } -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +AggregateProgressMonitor* +aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ AggregateProgressMonitor* self = NULL; - guint64 _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; #line 165 "/home/jens/Source/shotwell/src/core/util.vala" self = (AggregateProgressMonitor*) g_type_create_instance (object_type); #line 166 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = grand_total; -#line 166 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->grand_total = _tmp0_; -#line 167 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = wrapped_monitor; -#line 167 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1__target = wrapped_monitor_target; + self->priv->grand_total = grand_total; #line 167 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor = _tmp1_; + self->priv->wrapped_monitor = wrapped_monitor; #line 167 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor_target = _tmp1__target; + self->priv->wrapped_monitor_target = wrapped_monitor_target; #line 165 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 1390 "util.c" +#line 1599 "util.c" } -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +AggregateProgressMonitor* +aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ #line 165 "/home/jens/Source/shotwell/src/core/util.vala" return aggregate_progress_monitor_construct (TYPE_AGGREGATE_PROGRESS_MONITOR, grand_total, wrapped_monitor, wrapped_monitor_target); -#line 1397 "util.c" +#line 1610 "util.c" } -void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name) { - const gchar* _tmp0_; - guint64 _tmp1_; +void +aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, + const gchar* name) +{ + guint64 _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - guint64 _tmp4_; + guint64 _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; #line 170 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self)); #line 170 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (name != NULL); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = name; + _tmp0_ = self->priv->aggregate_count; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->aggregate_count; + _tmp1_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp0_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp1_); + _tmp2_ = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = _tmp2_; + _tmp3_ = self->priv->grand_total; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = self->priv->grand_total; + _tmp4_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp3_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp5_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp4_); + _tmp5_ = _tmp4_; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp6_ = _tmp5_; + g_debug ("util.vala:171: next step: %s (%s/%s)", name, _tmp2_, _tmp5_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - g_debug ("util.vala:171: next step: %s (%s/%s)", _tmp0_, _tmp3_, _tmp6_); + _g_free0 (_tmp5_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _g_free0 (_tmp6_); -#line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 172 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->last_count = G_MAXUINT64; -#line 1435 "util.c" +#line 1648 "util.c" } -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total) { +gboolean +aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total) +{ gboolean result = FALSE; guint64 _tmp0_ = 0ULL; guint64 _tmp1_; + guint64 _tmp3_; + guint64 _tmp4_; guint64 _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + ProgressMonitor _tmp7_; + void* _tmp7__target; + guint64 _tmp8_; guint64 _tmp9_; - ProgressMonitor _tmp10_; - void* _tmp10__target; - guint64 _tmp11_; - guint64 _tmp12_; - gboolean _tmp13_; #line 175 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self), FALSE); #line 177 "/home/jens/Source/shotwell/src/core/util.vala" _tmp1_ = self->priv->last_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" if (_tmp1_ != G_MAXUINT64) { -#line 1458 "util.c" +#line 1673 "util.c" guint64 _tmp2_; - guint64 _tmp3_; -#line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = self->priv->last_count; + _tmp2_ = self->priv->last_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = _tmp2_ - _tmp3_; -#line 1467 "util.c" + _tmp0_ = count - _tmp2_; +#line 1679 "util.c" } else { - guint64 _tmp4_; -#line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = _tmp4_; -#line 1474 "util.c" + _tmp0_ = count; +#line 1683 "util.c" } #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp5_ = self->priv->aggregate_count; + _tmp3_ = self->priv->aggregate_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->aggregate_count = _tmp5_ + _tmp0_; + self->priv->aggregate_count = _tmp3_ + _tmp0_; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp6_ = self->priv->aggregate_count; + _tmp4_ = self->priv->aggregate_count; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp7_ = self->priv->grand_total; + _tmp5_ = self->priv->grand_total; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - if (_tmp6_ > _tmp7_) { -#line 1486 "util.c" - guint64 _tmp8_; + if (_tmp4_ > _tmp5_) { +#line 1695 "util.c" + guint64 _tmp6_; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp8_ = self->priv->grand_total; + _tmp6_ = self->priv->grand_total; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->aggregate_count = _tmp8_; -#line 1492 "util.c" + self->priv->aggregate_count = _tmp6_; +#line 1701 "util.c" } #line 182 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp9_ = count; -#line 182 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->last_count = _tmp9_; -#line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp10_ = self->priv->wrapped_monitor; + self->priv->last_count = count; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp10__target = self->priv->wrapped_monitor_target; + _tmp7_ = self->priv->wrapped_monitor; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp11_ = self->priv->aggregate_count; + _tmp7__target = self->priv->wrapped_monitor_target; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp12_ = self->priv->grand_total; + _tmp8_ = self->priv->aggregate_count; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp13_ = _tmp10_ (_tmp11_, _tmp12_, TRUE, _tmp10__target); + _tmp9_ = self->priv->grand_total; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp13_; + result = _tmp7_ (_tmp8_, _tmp9_, TRUE, _tmp7__target); #line 184 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1512 "util.c" +#line 1717 "util.c" } -static void value_aggregate_progress_monitor_init (GValue* value) { +static void +value_aggregate_progress_monitor_init (GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1519 "util.c" +#line 1726 "util.c" } -static void value_aggregate_progress_monitor_free_value (GValue* value) { +static void +value_aggregate_progress_monitor_free_value (GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (value->data[0].v_pointer); -#line 1528 "util.c" +#line 1737 "util.c" } } -static void value_aggregate_progress_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_aggregate_progress_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (src_value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = aggregate_progress_monitor_ref (src_value->data[0].v_pointer); -#line 1538 "util.c" +#line 1750 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = NULL; -#line 1542 "util.c" +#line 1754 "util.c" } } -static gpointer value_aggregate_progress_monitor_peek_pointer (const GValue* value) { +static gpointer +value_aggregate_progress_monitor_peek_pointer (const GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1550 "util.c" +#line 1764 "util.c" } -static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_aggregate_progress_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { -#line 1557 "util.c" +#line 1776 "util.c" AggregateProgressMonitor * object; object = collect_values[0].v_pointer; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (object->parent_instance.g_class == NULL) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1564 "util.c" +#line 1783 "util.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 159 "/home/jens/Source/shotwell/src/core/util.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 1568 "util.c" +#line 1787 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = aggregate_progress_monitor_ref (object); -#line 1572 "util.c" +#line 1791 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1576 "util.c" +#line 1795 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1580 "util.c" +#line 1799 "util.c" } -static gchar* value_aggregate_progress_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_aggregate_progress_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ AggregateProgressMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1591 "util.c" +#line 1815 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (!value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = NULL; -#line 1597 "util.c" +#line 1821 "util.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = value->data[0].v_pointer; -#line 1601 "util.c" +#line 1825 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = aggregate_progress_monitor_ref (value->data[0].v_pointer); -#line 1605 "util.c" +#line 1829 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1609 "util.c" +#line 1833 "util.c" } -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAggregateProgressMonitor* spec; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_AGGREGATE_PROGRESS_MONITOR), NULL); @@ -1619,20 +1849,25 @@ GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return G_PARAM_SPEC (spec); -#line 1623 "util.c" +#line 1853 "util.c" } -gpointer value_get_aggregate_progress_monitor (const GValue* value) { +gpointer +value_get_aggregate_progress_monitor (const GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR), NULL); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1632 "util.c" +#line 1864 "util.c" } -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { +void +value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object) +{ AggregateProgressMonitor * old; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR)); @@ -1648,22 +1883,25 @@ void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_ref (value->data[0].v_pointer); -#line 1652 "util.c" +#line 1887 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1656 "util.c" +#line 1891 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (old); -#line 1662 "util.c" +#line 1897 "util.c" } } -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) { +void +value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object) +{ AggregateProgressMonitor * old; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR)); @@ -1677,33 +1915,37 @@ void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = v_object; -#line 1681 "util.c" +#line 1919 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1685 "util.c" +#line 1923 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (old); -#line 1691 "util.c" +#line 1929 "util.c" } } -static void aggregate_progress_monitor_class_init (AggregateProgressMonitorClass * klass) { +static void +aggregate_progress_monitor_class_init (AggregateProgressMonitorClass * klass) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_parent_class = g_type_class_peek_parent (klass); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" ((AggregateProgressMonitorClass *) klass)->finalize = aggregate_progress_monitor_finalize; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (AggregateProgressMonitorPrivate)); -#line 1703 "util.c" +#line 1943 "util.c" } -static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self) { +static void +aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = AGGREGATE_PROGRESS_MONITOR_GET_PRIVATE (self); #line 162 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1712,21 +1954,25 @@ static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self->priv->last_count = G_MAXUINT64; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self->ref_count = 1; -#line 1716 "util.c" +#line 1958 "util.c" } -static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) { +static void +aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) +{ AggregateProgressMonitor * self; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitor); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_signal_handlers_destroy (self); -#line 1726 "util.c" +#line 1970 "util.c" } -GType aggregate_progress_monitor_get_type (void) { +GType +aggregate_progress_monitor_get_type (void) +{ static volatile gsize aggregate_progress_monitor_type_id__volatile = 0; if (g_once_init_enter (&aggregate_progress_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_aggregate_progress_monitor_init, value_aggregate_progress_monitor_free_value, value_aggregate_progress_monitor_copy_value, value_aggregate_progress_monitor_peek_pointer, "p", value_aggregate_progress_monitor_collect_value, "p", value_aggregate_progress_monitor_lcopy_value }; @@ -1740,18 +1986,22 @@ GType aggregate_progress_monitor_get_type (void) { } -gpointer aggregate_progress_monitor_ref (gpointer instance) { +gpointer +aggregate_progress_monitor_ref (gpointer instance) +{ AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return instance; -#line 1751 "util.c" +#line 1999 "util.c" } -void aggregate_progress_monitor_unref (gpointer instance) { +void +aggregate_progress_monitor_unref (gpointer instance) +{ AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1760,31 +2010,33 @@ void aggregate_progress_monitor_unref (gpointer instance) { AGGREGATE_PROGRESS_MONITOR_GET_CLASS (self)->finalize (self); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1764 "util.c" +#line 2014 "util.c" } } -gboolean null_progress_monitor (guint64 count, guint64 total) { +gboolean +null_progress_monitor (guint64 count, + guint64 total) +{ gboolean result = FALSE; #line 190 "/home/jens/Source/shotwell/src/core/util.vala" result = TRUE; #line 190 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1775 "util.c" +#line 2028 "util.c" } -gdouble degrees_to_radians (gdouble theta) { +gdouble +degrees_to_radians (gdouble theta) +{ gdouble result = 0.0; - gdouble _tmp0_; -#line 195 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = theta; #line 195 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp0_ * (G_PI / 180.0); + result = theta * (G_PI / 180.0); #line 195 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1788 "util.c" +#line 2040 "util.c" } -- cgit v1.2.3