diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Alteration.c | 770 | ||||
| -rw-r--r-- | src/core/ContainerSourceCollection.c | 744 | ||||
| -rw-r--r-- | src/core/Core.c | 2 | ||||
| -rw-r--r-- | src/core/DataCollection.c | 1499 | ||||
| -rw-r--r-- | src/core/DataObject.c | 86 | ||||
| -rw-r--r-- | src/core/DataSet.c | 224 | ||||
| -rw-r--r-- | src/core/DataSource.c | 1819 | ||||
| -rw-r--r-- | src/core/DataSourceTypes.c | 139 | ||||
| -rw-r--r-- | src/core/DataView.c | 213 | ||||
| -rw-r--r-- | src/core/DataViewTypes.c | 61 | ||||
| -rw-r--r-- | src/core/DatabaseSourceCollection.c | 170 | ||||
| -rw-r--r-- | src/core/SourceCollection.c | 548 | ||||
| -rw-r--r-- | src/core/SourceHoldingTank.c | 607 | ||||
| -rw-r--r-- | src/core/SourceInterfaces.c | 78 | ||||
| -rw-r--r-- | src/core/Tracker.c | 715 | ||||
| -rw-r--r-- | src/core/ViewCollection.c | 3634 | ||||
| -rw-r--r-- | src/core/util.c | 214 |
17 files changed, 5816 insertions, 5707 deletions
diff --git a/src/core/Alteration.c b/src/core/Alteration.c index b1e62b6..173f45f 100644 --- a/src/core/Alteration.c +++ b/src/core/Alteration.c @@ -1,4 +1,4 @@ -/* Alteration.c generated by valac 0.34.7, the Vala compiler +/* Alteration.c generated by valac 0.36.6, the Vala compiler * generated from Alteration.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -111,7 +111,7 @@ 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 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 gint _vala_array_length (gpointer array); @@ -119,8 +119,8 @@ static gint _vala_array_length (gpointer array); Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail) { Alteration* self = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = 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" @@ -148,19 +148,19 @@ Alteration* alteration_new (const gchar* subject, const gchar* detail) { Alteration* alteration_construct_from_list (GType object_type, const gchar* list) { Alteration* self = NULL; - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + const gchar* _tmp0_; + gint _tmp1_; + gint _tmp2_; gchar** pairs = NULL; - const gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint pairs_length1 = 0; - gint _pairs_size_ = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + const gchar* _tmp3_; + gchar** _tmp4_; + gchar** _tmp5_; + gint pairs_length1; + gint _pairs_size_; + gchar** _tmp6_; + gint _tmp6__length1; + gchar** _tmp7_; + gint _tmp7__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" @@ -206,7 +206,7 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list #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_ = NULL; + gchar* _tmp8_; gchar* pair = NULL; #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp8_ = g_strdup (pair_collection[pair_it]); @@ -215,19 +215,19 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list #line 216 "Alteration.c" { gchar** subject_detail = NULL; - const gchar* _tmp9_ = NULL; - gchar** _tmp10_ = NULL; - gchar** _tmp11_ = NULL; - gint subject_detail_length1 = 0; - gint _subject_detail_size_ = 0; - gchar** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp14_ = NULL; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; - const gchar* _tmp16_ = NULL; + const gchar* _tmp9_; + gchar** _tmp10_; + gchar** _tmp11_; + gint subject_detail_length1; + gint _subject_detail_size_; + gchar** _tmp12_; + gint _tmp12__length1; + 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; #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -283,10 +283,10 @@ Alteration* alteration_new_from_list (const gchar* list) { Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1) { Alteration* self = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + 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" @@ -312,7 +312,7 @@ Alteration* alteration_construct_from_array (GType object_type, gchar** array, i #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_ = NULL; + gchar* _tmp2_; gchar* pair = NULL; #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp2_ = g_strdup (pair_collection[pair_it]); @@ -321,19 +321,19 @@ Alteration* alteration_construct_from_array (GType object_type, gchar** array, i #line 322 "Alteration.c" { gchar** subject_detail = NULL; - const gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint subject_detail_length1 = 0; - gint _subject_detail_size_ = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - const gchar* _tmp10_ = NULL; + const gchar* _tmp3_; + gchar** _tmp4_; + gchar** _tmp5_; + gint subject_detail_length1; + gint _subject_detail_size_; + gchar** _tmp6_; + gint _tmp6__length1; + 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; #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -394,8 +394,8 @@ static gpointer _g_object_ref0 (gpointer self) { static Alteration* alteration_construct_from_map (GType object_type, GeeMultiMap* map) { Alteration* self = NULL; - GeeMultiMap* _tmp0_ = NULL; - GeeMultiMap* _tmp1_ = 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" @@ -424,21 +424,21 @@ static Alteration* alteration_new_from_map (GeeMultiMap* map) { static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 444 "Alteration.c" } @@ -446,24 +446,24 @@ static gchar* string_strip (const gchar* self) { static void alteration_add_detail (Alteration* self, const gchar* sub, const gchar* det) { gchar* subject = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gint _tmp3_; + gint _tmp4_; gchar* detail = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + const gchar* _tmp5_; + gchar* _tmp6_; + const gchar* _tmp7_; + gint _tmp8_; + gint _tmp9_; gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - GeeMultiMap* _tmp18_ = NULL; - const gchar* _tmp20_ = NULL; - GeeMultiMap* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; + const gchar* _tmp11_; + GeeMultiMap* _tmp18_; + const gchar* _tmp20_; + GeeMultiMap* _tmp25_; + const gchar* _tmp26_; + const gchar* _tmp27_; #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" @@ -503,7 +503,7 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp11_ == NULL) { #line 506 "Alteration.c" - GeeMultiMap* _tmp12_ = NULL; + GeeMultiMap* _tmp12_; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp12_ = self->priv->map; #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -517,11 +517,11 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp10_) { #line 520 "Alteration.c" - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + const 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; #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -555,7 +555,7 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch #line 85 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp18_ == NULL) { #line 558 "Alteration.c" - GeeMultiMap* _tmp19_ = NULL; + GeeMultiMap* _tmp19_; #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp19_ = alteration_create_map (self); #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -569,10 +569,10 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch #line 89 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp20_ != NULL) { #line 572 "Alteration.c" - const gchar* _tmp21_ = NULL; - GeeMultiMap* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; + const gchar* _tmp21_; + GeeMultiMap* _tmp22_; + const gchar* _tmp23_; + const gchar* _tmp24_; #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp21_ = self->priv->detail; #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -631,7 +631,7 @@ static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, gco static GeeMultiMap* alteration_create_map (Alteration* self) { GeeMultiMap* result = NULL; - GeeHashMultiMap* _tmp0_ = NULL; + GeeHashMultiMap* _tmp0_; #line 101 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), NULL); #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -646,9 +646,9 @@ static GeeMultiMap* alteration_create_map (Alteration* self) { static gboolean alteration_case_equal (const gchar* a, const gchar* b) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = 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" @@ -665,8 +665,8 @@ static gboolean alteration_case_equal (const gchar* a, const gchar* b) { static guint alteration_case_hash (const gchar* a) { guint result = 0U; - const gchar* _tmp0_ = NULL; - guint _tmp1_ = 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" @@ -681,9 +681,9 @@ static guint alteration_case_hash (const gchar* a) { static inline gboolean alteration_equal_values (const gchar* str1, const gchar* str2) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; + 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" @@ -704,9 +704,9 @@ static inline gboolean alteration_equal_values (const gchar* str1, const gchar* static inline guint alteration_hash_value (const gchar* str) { guint result = 0U; - GHashFunc _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - guint _tmp2_ = 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" @@ -725,12 +725,12 @@ static inline guint alteration_hash_value (const gchar* str) { gboolean alteration_has_subject (Alteration* self, const gchar* subject) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - GeeMultiMap* _tmp4_ = NULL; + const gchar* _tmp0_; + GeeMultiMap* _tmp4_; GeeSet* keys = NULL; - GeeMultiMap* _tmp5_ = NULL; - GeeSet* _tmp6_ = NULL; - GeeSet* _tmp7_ = NULL; + GeeMultiMap* _tmp5_; + GeeSet* _tmp6_; + GeeSet* _tmp7_; #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" @@ -740,9 +740,9 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { #line 122 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_ != NULL) { #line 743 "Alteration.c" - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + 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" @@ -772,8 +772,8 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { #line 773 "Alteration.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; + GeeSet* _tmp8_; + GeeIterator* _tmp9_; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp8_ = keys; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -783,14 +783,14 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 786 "Alteration.c" - GeeIterator* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GeeIterator* _tmp10_; + gboolean _tmp11_; gchar* key = NULL; - GeeIterator* _tmp12_ = NULL; - gpointer _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + 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; #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -849,13 +849,13 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) { gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - GeeMultiMap* _tmp10_ = NULL; + const gchar* _tmp1_; + GeeMultiMap* _tmp10_; GeeCollection* values = NULL; - GeeMultiMap* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GeeCollection* _tmp13_ = NULL; - GeeCollection* _tmp14_ = NULL; + GeeMultiMap* _tmp11_; + const gchar* _tmp12_; + GeeCollection* _tmp13_; + GeeCollection* _tmp14_; #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" @@ -867,7 +867,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp1_ != NULL) { #line 870 "Alteration.c" - const gchar* _tmp2_ = NULL; + 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" @@ -882,9 +882,9 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc if (_tmp0_) { #line 884 "Alteration.c" gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = 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" @@ -894,9 +894,9 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp6_) { #line 897 "Alteration.c" - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + const gchar* _tmp7_; + const gchar* _tmp8_; + gboolean _tmp9_; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp7_ = self->priv->detail; #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -936,8 +936,8 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc #line 937 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp15_ = NULL; - GeeIterator* _tmp16_ = NULL; + GeeCollection* _tmp15_; + GeeIterator* _tmp16_; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp15_ = values; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -947,14 +947,14 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 950 "Alteration.c" - GeeIterator* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + GeeIterator* _tmp17_; + gboolean _tmp18_; gchar* value = NULL; - GeeIterator* _tmp19_ = NULL; - gpointer _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + 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; #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1014,9 +1014,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { GeeCollection* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; GeeCollection* _tmp10_ = NULL; - GeeMultiMap* _tmp11_ = NULL; + GeeMultiMap* _tmp11_; #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" @@ -1026,7 +1026,7 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp2_ != NULL) { #line 1029 "Alteration.c" - const gchar* _tmp3_ = NULL; + 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" @@ -1040,9 +1040,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp1_) { #line 1043 "Alteration.c" - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + 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" @@ -1061,9 +1061,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { if (_tmp0_) { #line 1063 "Alteration.c" GeeArrayList* details = NULL; - GeeArrayList* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + GeeArrayList* _tmp7_; + GeeArrayList* _tmp8_; + const gchar* _tmp9_; #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); #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1085,9 +1085,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp11_ != NULL) { #line 1088 "Alteration.c" - GeeMultiMap* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GeeCollection* _tmp14_ = NULL; + GeeMultiMap* _tmp12_; + const gchar* _tmp13_; + GeeCollection* _tmp14_; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp12_ = self->priv->map; #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1116,10 +1116,10 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) { gchar* alteration_to_string (Alteration* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - GeeMultiMap* _tmp5_ = NULL; + const gchar* _tmp0_; + GeeMultiMap* _tmp5_; gchar* str = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp6_; #line 164 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_val_if_fail (IS_ALTERATION (self), NULL); #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1127,10 +1127,10 @@ gchar* alteration_to_string (Alteration* self) { #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp0_ != NULL) { #line 1130 "Alteration.c" - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; #line 166 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp1_ = self->priv->detail; #line 166 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1158,11 +1158,11 @@ gchar* alteration_to_string (Alteration* self) { #line 1159 "Alteration.c" { GeeIterator* _key_it = NULL; - GeeMultiMap* _tmp7_ = NULL; - GeeSet* _tmp8_ = NULL; - GeeSet* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + GeeMultiMap* _tmp7_; + GeeSet* _tmp8_; + GeeSet* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp7_ = self->priv->map; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1180,11 +1180,11 @@ gchar* alteration_to_string (Alteration* self) { #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 1183 "Alteration.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + GeeIterator* _tmp12_; + gboolean _tmp13_; gchar* key = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; + GeeIterator* _tmp14_; + gpointer _tmp15_; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp12_ = _key_it; #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1204,12 +1204,12 @@ gchar* alteration_to_string (Alteration* self) { #line 1205 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeMultiMap* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - GeeCollection* _tmp18_ = NULL; - GeeCollection* _tmp19_ = NULL; - GeeIterator* _tmp20_ = NULL; - GeeIterator* _tmp21_ = NULL; + GeeMultiMap* _tmp16_; + const gchar* _tmp17_; + GeeCollection* _tmp18_; + GeeCollection* _tmp19_; + GeeIterator* _tmp20_; + GeeIterator* _tmp21_; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp16_ = self->priv->map; #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1229,20 +1229,20 @@ gchar* alteration_to_string (Alteration* self) { #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 1232 "Alteration.c" - GeeIterator* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + GeeIterator* _tmp22_; + gboolean _tmp23_; gchar* value = NULL; - GeeIterator* _tmp24_ = NULL; - gpointer _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; - const gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; + GeeIterator* _tmp24_; + gpointer _tmp25_; + const gchar* _tmp26_; + gint _tmp27_; + gint _tmp28_; + const gchar* _tmp31_; + const gchar* _tmp32_; + const 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" @@ -1268,8 +1268,8 @@ gchar* alteration_to_string (Alteration* self) { #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp28_ != 0) { #line 1271 "Alteration.c" - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + const gchar* _tmp29_; + gchar* _tmp30_; #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp29_ = str; #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1324,16 +1324,16 @@ gchar* alteration_to_string (Alteration* self) { gboolean alteration_contains_any (Alteration* self, Alteration* other) { gboolean result = FALSE; - Alteration* _tmp0_ = NULL; + Alteration* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; - GeeMultiMap* _tmp21_ = NULL; + GeeMultiMap* _tmp21_; gboolean _tmp56_ = FALSE; - GeeMultiMap* _tmp57_ = NULL; + GeeMultiMap* _tmp57_; #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" @@ -1353,8 +1353,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp4_ != NULL) { #line 1356 "Alteration.c" - Alteration* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + Alteration* _tmp5_; + const gchar* _tmp6_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp5_ = other; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1370,7 +1370,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp3_) { #line 1373 "Alteration.c" - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp7_ = self->priv->detail; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1384,8 +1384,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp2_) { #line 1387 "Alteration.c" - Alteration* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + Alteration* _tmp8_; + const gchar* _tmp9_; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp8_ = other; #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1402,10 +1402,10 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { if (_tmp1_) { #line 1404 "Alteration.c" gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - Alteration* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gboolean _tmp14_ = 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" @@ -1417,10 +1417,10 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp14_) { #line 1420 "Alteration.c" - const gchar* _tmp15_ = NULL; - Alteration* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + const gchar* _tmp15_; + Alteration* _tmp16_; + const gchar* _tmp17_; + gboolean _tmp18_; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp15_ = self->priv->detail; #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1448,8 +1448,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp21_ != NULL) { #line 1451 "Alteration.c" - Alteration* _tmp22_ = NULL; - GeeMultiMap* _tmp23_ = NULL; + Alteration* _tmp22_; + GeeMultiMap* _tmp23_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp22_ = other; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1469,14 +1469,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 1470 "Alteration.c" } else { gboolean _tmp24_ = FALSE; - GeeMultiMap* _tmp25_ = NULL; + GeeMultiMap* _tmp25_; #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_ = NULL; - GeeMultiMap* _tmp27_ = NULL; + Alteration* _tmp26_; + GeeMultiMap* _tmp27_; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp26_ = other; #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1497,35 +1497,35 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { if (_tmp19_) { #line 1499 "Alteration.c" const gchar* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; + const gchar* _tmp29_; gchar* single_subject = NULL; - gchar* _tmp33_ = NULL; + gchar* _tmp33_; const gchar* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; + const gchar* _tmp35_; gchar* single_detail = NULL; - gchar* _tmp39_ = NULL; + gchar* _tmp39_; GeeMultiMap* _tmp40_ = NULL; - GeeMultiMap* _tmp41_ = NULL; + GeeMultiMap* _tmp41_; GeeMultiMap* multimap = NULL; - GeeMultiMap* _tmp45_ = NULL; + GeeMultiMap* _tmp45_; gboolean _tmp46_ = FALSE; - GeeMultiMap* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; - gboolean _tmp49_ = FALSE; + GeeMultiMap* _tmp47_; + const gchar* _tmp48_; + gboolean _tmp49_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp29_ = self->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp29_ != NULL) { #line 1520 "Alteration.c" - const gchar* _tmp30_ = NULL; + const gchar* _tmp30_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp30_ = self->priv->subject; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp28_ = _tmp30_; #line 1526 "Alteration.c" } else { - Alteration* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; + Alteration* _tmp31_; + const gchar* _tmp32_; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp31_ = other; #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1543,15 +1543,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp35_ != NULL) { #line 1546 "Alteration.c" - const gchar* _tmp36_ = NULL; + const gchar* _tmp36_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp36_ = self->priv->detail; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp34_ = _tmp36_; #line 1552 "Alteration.c" } else { - Alteration* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; + Alteration* _tmp37_; + const gchar* _tmp38_; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp37_ = other; #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1569,15 +1569,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp41_ != NULL) { #line 1572 "Alteration.c" - GeeMultiMap* _tmp42_ = NULL; + GeeMultiMap* _tmp42_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp42_ = self->priv->map; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp40_ = _tmp42_; #line 1578 "Alteration.c" } else { - Alteration* _tmp43_ = NULL; - GeeMultiMap* _tmp44_ = NULL; + Alteration* _tmp43_; + GeeMultiMap* _tmp44_; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp43_ = other; #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1599,12 +1599,12 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp49_) { #line 1602 "Alteration.c" - GeeMultiMap* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - GeeCollection* _tmp52_ = NULL; - GeeCollection* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - gboolean _tmp55_ = FALSE; + 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; #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1644,8 +1644,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp57_ != NULL) { #line 1647 "Alteration.c" - Alteration* _tmp58_ = NULL; - GeeMultiMap* _tmp59_ = NULL; + Alteration* _tmp58_; + GeeMultiMap* _tmp59_; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp58_ = other; #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1662,14 +1662,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { if (_tmp56_) { #line 1664 "Alteration.c" GeeSet* keys = NULL; - GeeMultiMap* _tmp60_ = NULL; - GeeSet* _tmp61_ = NULL; - GeeSet* _tmp62_ = NULL; + GeeMultiMap* _tmp60_; + GeeSet* _tmp61_; + GeeSet* _tmp62_; GeeSet* other_keys = NULL; - Alteration* _tmp63_ = NULL; - GeeMultiMap* _tmp64_ = NULL; - GeeSet* _tmp65_ = NULL; - GeeSet* _tmp66_ = NULL; + Alteration* _tmp63_; + GeeMultiMap* _tmp64_; + GeeSet* _tmp65_; + GeeSet* _tmp66_; #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp60_ = self->priv->map; #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1695,8 +1695,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 1696 "Alteration.c" { GeeIterator* _subject_it = NULL; - GeeSet* _tmp67_ = NULL; - GeeIterator* _tmp68_ = NULL; + GeeSet* _tmp67_; + GeeIterator* _tmp68_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp67_ = other_keys; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1706,25 +1706,25 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 1709 "Alteration.c" - GeeIterator* _tmp69_ = NULL; - gboolean _tmp70_ = FALSE; + GeeIterator* _tmp69_; + gboolean _tmp70_; gchar* subject = NULL; - GeeIterator* _tmp71_ = NULL; - gpointer _tmp72_ = NULL; - GeeSet* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; - gboolean _tmp75_ = FALSE; + GeeIterator* _tmp71_; + gpointer _tmp72_; + GeeSet* _tmp73_; + const gchar* _tmp74_; + gboolean _tmp75_; GeeCollection* details = NULL; - GeeMultiMap* _tmp76_ = NULL; - const gchar* _tmp77_ = NULL; - GeeCollection* _tmp78_ = NULL; + GeeMultiMap* _tmp76_; + const gchar* _tmp77_; + GeeCollection* _tmp78_; GeeCollection* other_details = NULL; - Alteration* _tmp79_ = NULL; - GeeMultiMap* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; - GeeCollection* _tmp82_ = NULL; + Alteration* _tmp79_; + GeeMultiMap* _tmp80_; + const gchar* _tmp81_; + GeeCollection* _tmp82_; gboolean _tmp83_ = FALSE; - GeeCollection* _tmp84_ = NULL; + GeeCollection* _tmp84_; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp69_ = _subject_it; #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1778,7 +1778,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp84_ != NULL) { #line 1781 "Alteration.c" - GeeCollection* _tmp85_ = NULL; + GeeCollection* _tmp85_; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp85_ = other_details; #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1794,8 +1794,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 1795 "Alteration.c" { GeeIterator* _detail_it = NULL; - GeeCollection* _tmp86_ = NULL; - GeeIterator* _tmp87_ = NULL; + GeeCollection* _tmp86_; + GeeIterator* _tmp87_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp86_ = other_details; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1805,14 +1805,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 1808 "Alteration.c" - GeeIterator* _tmp88_ = NULL; - gboolean _tmp89_ = FALSE; + GeeIterator* _tmp88_; + gboolean _tmp89_; gchar* detail = NULL; - GeeIterator* _tmp90_ = NULL; - gpointer _tmp91_ = NULL; - GeeCollection* _tmp92_ = NULL; - const gchar* _tmp93_ = NULL; - gboolean _tmp94_ = FALSE; + GeeIterator* _tmp90_; + gpointer _tmp91_; + GeeCollection* _tmp92_; + const gchar* _tmp93_; + gboolean _tmp94_; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp88_ = _detail_it; #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1896,13 +1896,13 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) { gboolean alteration_equals (Alteration* self, Alteration* other) { gboolean result = FALSE; - Alteration* _tmp0_ = NULL; + Alteration* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; gboolean _tmp19_ = FALSE; - GeeMultiMap* _tmp20_ = NULL; + GeeMultiMap* _tmp20_; #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" @@ -1922,8 +1922,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp4_ != NULL) { #line 1925 "Alteration.c" - Alteration* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + Alteration* _tmp5_; + const gchar* _tmp6_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp5_ = other; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1939,7 +1939,7 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp3_) { #line 1942 "Alteration.c" - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp7_ = self->priv->detail; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1953,8 +1953,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp2_) { #line 1956 "Alteration.c" - Alteration* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + Alteration* _tmp8_; + const gchar* _tmp9_; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp8_ = other; #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -1971,10 +1971,10 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { if (_tmp1_) { #line 1973 "Alteration.c" gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - Alteration* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gboolean _tmp14_ = 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" @@ -1986,10 +1986,10 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp14_) { #line 1989 "Alteration.c" - const gchar* _tmp15_ = NULL; - Alteration* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + const gchar* _tmp15_; + Alteration* _tmp16_; + const gchar* _tmp17_; + gboolean _tmp18_; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp15_ = self->priv->detail; #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2017,8 +2017,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp20_ != NULL) { #line 2020 "Alteration.c" - Alteration* _tmp21_ = NULL; - GeeMultiMap* _tmp22_ = NULL; + Alteration* _tmp21_; + GeeMultiMap* _tmp22_; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp21_ = other; #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2035,26 +2035,26 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { if (_tmp19_) { #line 2037 "Alteration.c" GeeSet* keys = NULL; - GeeMultiMap* _tmp23_ = NULL; - GeeSet* _tmp24_ = NULL; - GeeSet* _tmp25_ = NULL; + GeeMultiMap* _tmp23_; + GeeSet* _tmp24_; + GeeSet* _tmp25_; GeeSet* other_keys = NULL; - Alteration* _tmp26_ = NULL; - GeeMultiMap* _tmp27_ = NULL; - GeeSet* _tmp28_ = NULL; - GeeSet* _tmp29_ = NULL; - GeeSet* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - GeeSet* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - GeeSet* _tmp36_ = NULL; - GeeSet* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; - GeeSet* _tmp39_ = NULL; - GeeSet* _tmp40_ = NULL; - gboolean _tmp41_ = FALSE; + Alteration* _tmp26_; + GeeMultiMap* _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; #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2139,8 +2139,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { } { GeeIterator* _key_it = NULL; - GeeSet* _tmp42_ = NULL; - GeeIterator* _tmp43_ = NULL; + GeeSet* _tmp42_; + GeeIterator* _tmp43_; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp42_ = keys; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2150,32 +2150,32 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 2153 "Alteration.c" - GeeIterator* _tmp44_ = NULL; - gboolean _tmp45_ = FALSE; + GeeIterator* _tmp44_; + gboolean _tmp45_; gchar* key = NULL; - GeeIterator* _tmp46_ = NULL; - gpointer _tmp47_ = NULL; + GeeIterator* _tmp46_; + gpointer _tmp47_; GeeCollection* values = NULL; - GeeMultiMap* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; - GeeCollection* _tmp50_ = NULL; + GeeMultiMap* _tmp48_; + const gchar* _tmp49_; + GeeCollection* _tmp50_; GeeCollection* other_values = NULL; - Alteration* _tmp51_ = NULL; - GeeMultiMap* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; - GeeCollection* _tmp54_ = NULL; - GeeCollection* _tmp55_ = NULL; - gint _tmp56_ = 0; - gint _tmp57_ = 0; - GeeCollection* _tmp58_ = NULL; - gint _tmp59_ = 0; - gint _tmp60_ = 0; - GeeCollection* _tmp61_ = NULL; - GeeCollection* _tmp62_ = NULL; - gboolean _tmp63_ = FALSE; - GeeCollection* _tmp64_ = NULL; - GeeCollection* _tmp65_ = NULL; - gboolean _tmp66_ = FALSE; + 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; #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2326,8 +2326,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) { static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) { GeeSet* keys = NULL; - GeeMultiMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; + GeeMultiMap* _tmp0_; + GeeSet* _tmp1_; #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" @@ -2341,8 +2341,8 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) { #line 2342 "Alteration.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; + GeeSet* _tmp2_; + GeeIterator* _tmp3_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp2_ = keys; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2352,15 +2352,15 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) { #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 2355 "Alteration.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GeeIterator* _tmp4_; + gboolean _tmp5_; gchar* key = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; + GeeIterator* _tmp6_; + gpointer _tmp7_; GeeCollection* values = NULL; - GeeMultiMap* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; + GeeMultiMap* _tmp8_; + const gchar* _tmp9_; + GeeCollection* _tmp10_; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp4_ = _key_it; #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2388,8 +2388,8 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) { #line 2389 "Alteration.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp11_ = NULL; - GeeIterator* _tmp12_ = NULL; + GeeCollection* _tmp11_; + GeeIterator* _tmp12_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp11_ = values; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2399,14 +2399,14 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) { #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" while (TRUE) { #line 2402 "Alteration.c" - GeeIterator* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + GeeIterator* _tmp13_; + gboolean _tmp14_; gchar* value = NULL; - GeeIterator* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; - GeeMultiMap* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; + GeeIterator* _tmp15_; + gpointer _tmp16_; + GeeMultiMap* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp13_ = _value_it; #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2464,17 +2464,17 @@ static gpointer _alteration_ref0 (gpointer self) { Alteration* alteration_compress (Alteration* self, Alteration* other) { Alteration* result = NULL; - Alteration* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + Alteration* _tmp0_; + gboolean _tmp1_; GeeMultiMap* compressed = NULL; - GeeMultiMap* _tmp3_ = NULL; + GeeMultiMap* _tmp3_; gboolean _tmp4_ = FALSE; - const gchar* _tmp5_ = NULL; + const gchar* _tmp5_; gboolean _tmp13_ = FALSE; - Alteration* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GeeMultiMap* _tmp28_ = NULL; - Alteration* _tmp29_ = NULL; + Alteration* _tmp14_; + const gchar* _tmp15_; + GeeMultiMap* _tmp28_; + Alteration* _tmp29_; #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" @@ -2486,7 +2486,7 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) { #line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp1_) { #line 2489 "Alteration.c" - Alteration* _tmp2_ = NULL; + Alteration* _tmp2_; #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp2_ = _alteration_ref0 (self); #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2504,7 +2504,7 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) { #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp5_ != NULL) { #line 2507 "Alteration.c" - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp6_ = self->priv->detail; #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2518,9 +2518,9 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) { #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp4_) { #line 2521 "Alteration.c" - GeeMultiMap* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + GeeMultiMap* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp7_ = compressed; #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2531,9 +2531,9 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) { gee_multi_map_set (_tmp7_, _tmp8_, _tmp9_); #line 2533 "Alteration.c" } else { - GeeMultiMap* _tmp10_ = NULL; - GeeMultiMap* _tmp11_ = NULL; - GeeMultiMap* _tmp12_ = NULL; + GeeMultiMap* _tmp10_; + GeeMultiMap* _tmp11_; + GeeMultiMap* _tmp12_; #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp10_ = self->priv->map; #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2553,8 +2553,8 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) { #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp15_ != NULL) { #line 2556 "Alteration.c" - Alteration* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + Alteration* _tmp16_; + const gchar* _tmp17_; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp16_ = other; #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2570,11 +2570,11 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) { #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (_tmp13_) { #line 2573 "Alteration.c" - GeeMultiMap* _tmp18_ = NULL; - Alteration* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - Alteration* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + 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" @@ -2589,11 +2589,11 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) { gee_multi_map_set (_tmp18_, _tmp20_, _tmp22_); #line 2591 "Alteration.c" } else { - Alteration* _tmp23_ = NULL; - GeeMultiMap* _tmp24_ = NULL; - GeeMultiMap* _tmp25_ = NULL; - Alteration* _tmp26_ = NULL; - GeeMultiMap* _tmp27_ = NULL; + Alteration* _tmp23_; + GeeMultiMap* _tmp24_; + GeeMultiMap* _tmp25_; + Alteration* _tmp26_; + GeeMultiMap* _tmp27_; #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" _tmp23_ = other; #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2666,7 +2666,7 @@ static gchar* value_alteration_collect_value (GValue* value, guint n_collect_val #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (collect_values[0].v_pointer) { #line 2669 "Alteration.c" - Alteration* object; + 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) { @@ -2693,7 +2693,7 @@ static gchar* value_alteration_collect_value (GValue* value, guint n_collect_val static gchar* value_alteration_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - Alteration** object_p; + Alteration ** object_p; object_p = collect_values[0].v_pointer; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (!object_p) { @@ -2745,7 +2745,7 @@ gpointer value_get_alteration (const GValue* value) { void value_set_alteration (GValue* value, gpointer v_object) { - Alteration* old; + Alteration * old; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION)); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2776,7 +2776,7 @@ void value_set_alteration (GValue* value, gpointer v_object) { void value_take_alteration (GValue* value, gpointer v_object) { - Alteration* old; + Alteration * old; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION)); #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" @@ -2830,7 +2830,7 @@ static void alteration_instance_init (Alteration * self) { } -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); @@ -2861,7 +2861,7 @@ GType alteration_get_type (void) { gpointer alteration_ref (gpointer instance) { - Alteration* self; + Alteration * self; self = instance; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" g_atomic_int_inc (&self->ref_count); @@ -2872,7 +2872,7 @@ gpointer alteration_ref (gpointer instance) { void alteration_unref (gpointer instance) { - Alteration* self; + Alteration * self; self = instance; #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c index 247e471..7bd5826 100644 --- a/src/core/ContainerSourceCollection.c +++ b/src/core/ContainerSourceCollection.c @@ -1,4 +1,4 @@ -/* ContainerSourceCollection.c generated by valac 0.34.7, the Vala compiler +/* ContainerSourceCollection.c generated by valac 0.36.6, the Vala compiler * generated from ContainerSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -155,6 +155,14 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; +enum { + CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL, + 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 +}; +static guint container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_LAST_SIGNAL] = {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; } @@ -384,16 +392,16 @@ static void container_source_collection_real_container_contents_altered (Contain 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); +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* self = NULL; - const gchar* _tmp0_ = NULL; - GetSourceDatabaseKey _tmp1_ = NULL; - void* _tmp1__target = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + GetSourceDatabaseKey _tmp1_; + void* _tmp1__target; + const gchar* _tmp2_; + gchar* _tmp3_; #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" @@ -416,18 +424,18 @@ ContainerSourceCollection* container_source_collection_construct (GType object_t self->priv->backlink_name = _tmp3_; #line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return self; -#line 420 "ContainerSourceCollection.c" +#line 428 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_backlink_removed (SourceCollection* base, SourceBacklink* backlink, GeeCollection* sources) { ContainerSourceCollection * self; - SourceBacklink* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + SourceBacklink* _tmp0_; + GeeCollection* _tmp1_; ContainerSource* container = NULL; - SourceBacklink* _tmp2_ = NULL; - ContainerSource* _tmp3_ = NULL; - ContainerSource* _tmp4_ = NULL; + SourceBacklink* _tmp2_; + ContainerSource* _tmp3_; + ContainerSource* _tmp4_; #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" @@ -450,30 +458,30 @@ static void container_source_collection_real_notify_backlink_removed (SourceColl _tmp4_ = container; #line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp4_ != NULL) { -#line 454 "ContainerSourceCollection.c" - ContainerSource* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; +#line 462 "ContainerSourceCollection.c" + ContainerSource* _tmp5_; + GeeCollection* _tmp6_; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp5_ = container; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp6_ = sources; #line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" container_source_collection_notify_backlink_to_container_removed (self, _tmp5_, _tmp6_); -#line 463 "ContainerSourceCollection.c" +#line 471 "ContainerSourceCollection.c" } #line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 467 "ContainerSourceCollection.c" +#line 475 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) { - GeeHashSet* _tmp0_ = NULL; - ContainerSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - ContainerSource* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + 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" @@ -486,13 +494,13 @@ static void container_source_collection_real_notify_container_contents_added (Co _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 490 "ContainerSourceCollection.c" +#line 498 "ContainerSourceCollection.c" gboolean removed = FALSE; - GeeHashSet* _tmp3_ = NULL; - ContainerSource* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - ContainerSource* _tmp7_ = NULL; + 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" @@ -509,7 +517,7 @@ static void container_source_collection_real_notify_container_contents_added (Co _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 513 "ContainerSourceCollection.c" +#line 521 "ContainerSourceCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp8_ = container; @@ -518,8 +526,8 @@ static void container_source_collection_real_notify_container_contents_added (Co #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_by_name (self, "container-contents-added", _tmp8_, _tmp9_, _tmp10_); -#line 523 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); +#line 531 "ContainerSourceCollection.c" } @@ -528,14 +536,14 @@ void container_source_collection_notify_container_contents_added (ContainerSourc 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 532 "ContainerSourceCollection.c" +#line 540 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) { - ContainerSource* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + ContainerSource* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; #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" @@ -547,8 +555,8 @@ static void container_source_collection_real_notify_container_contents_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_by_name (self, "container-contents-removed", _tmp0_, _tmp1_, _tmp2_); -#line 552 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_); +#line 560 "ContainerSourceCollection.c" } @@ -557,16 +565,16 @@ void container_source_collection_notify_container_contents_removed (ContainerSou 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 561 "ContainerSourceCollection.c" +#line 569 "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_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeCollection* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + ContainerSource* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; + GeeCollection* _tmp3_; + gboolean _tmp4_; #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" @@ -584,8 +592,8 @@ static void container_source_collection_real_notify_container_contents_altered ( #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_by_name (self, "container-contents-altered", _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 589 "ContainerSourceCollection.c" + 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" } @@ -594,13 +602,13 @@ void container_source_collection_notify_container_contents_altered (ContainerSou 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 598 "ContainerSourceCollection.c" +#line 606 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) { - ContainerSource* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + ContainerSource* _tmp0_; + GeeCollection* _tmp1_; #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" @@ -610,8 +618,8 @@ static void container_source_collection_real_notify_backlink_to_container_remove #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_by_name (self, "backlink-to-container-removed", _tmp0_, _tmp1_); -#line 615 "ContainerSourceCollection.c" + g_signal_emit (self, container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_BACKLINK_TO_CONTAINER_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); +#line 623 "ContainerSourceCollection.c" } @@ -620,7 +628,7 @@ void container_source_collection_notify_backlink_to_container_removed (Container 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 624 "ContainerSourceCollection.c" +#line 632 "ContainerSourceCollection.c" } @@ -629,7 +637,7 @@ static GeeCollection* container_source_collection_real_get_containers_holding_so 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 633 "ContainerSourceCollection.c" +#line 641 "ContainerSourceCollection.c" } @@ -638,7 +646,7 @@ GeeCollection* container_source_collection_get_containers_holding_source (Contai 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 642 "ContainerSourceCollection.c" +#line 650 "ContainerSourceCollection.c" } @@ -647,7 +655,7 @@ static ContainerSource* container_source_collection_real_convert_backlink_to_con 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 651 "ContainerSourceCollection.c" +#line 659 "ContainerSourceCollection.c" } @@ -656,18 +664,18 @@ ContainerSource* container_source_collection_convert_backlink_to_container (Cont 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 660 "ContainerSourceCollection.c" +#line 668 "ContainerSourceCollection.c" } 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 667 "ContainerSourceCollection.c" +#line 675 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -676,13 +684,13 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC _collection_it = _tmp1_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 680 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 688 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -691,7 +699,7 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC if (!_tmp3_) { #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 695 "ContainerSourceCollection.c" +#line 703 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -705,11 +713,11 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 709 "ContainerSourceCollection.c" +#line 717 "ContainerSourceCollection.c" } #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 713 "ContainerSourceCollection.c" +#line 721 "ContainerSourceCollection.c" } } @@ -717,11 +725,11 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC 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 721 "ContainerSourceCollection.c" +#line 729 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -730,13 +738,13 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol _collection_it = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 734 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 742 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -745,7 +753,7 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol if (!_tmp3_) { #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 749 "ContainerSourceCollection.c" +#line 757 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -759,20 +767,20 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 763 "ContainerSourceCollection.c" +#line 771 "ContainerSourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 767 "ContainerSourceCollection.c" +#line 775 "ContainerSourceCollection.c" } } GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self) { GeeCollection* result = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; + GeeHashSet* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; #line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL); #line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -785,13 +793,13 @@ 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 789 "ContainerSourceCollection.c" +#line 797 "ContainerSourceCollection.c" } void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked) { - GeeHashSet* _tmp0_ = NULL; - ContainerSource* _tmp1_ = NULL; + 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" @@ -802,13 +810,13 @@ void container_source_collection_init_add_unlinked (ContainerSourceCollection* s _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 806 "ContainerSourceCollection.c" +#line 814 "ContainerSourceCollection.c" } void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked) { - GeeHashSet* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + 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" @@ -819,16 +827,16 @@ void container_source_collection_init_add_many_unlinked (ContainerSourceCollecti _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 823 "ContainerSourceCollection.c" +#line 831 "ContainerSourceCollection.c" } gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCollection* self, ContainerSource* source) { gboolean result = FALSE; - GeeHashSet* _tmp0_ = NULL; - ContainerSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - ContainerSource* _tmp3_ = NULL; + 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" @@ -845,7 +853,7 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo result = FALSE; #line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 849 "ContainerSourceCollection.c" +#line 857 "ContainerSourceCollection.c" } #line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp3_ = source; @@ -855,13 +863,13 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo result = TRUE; #line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return result; -#line 859 "ContainerSourceCollection.c" +#line 867 "ContainerSourceCollection.c" } static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking) { GeeHashMultiMap* map = NULL; - GeeHashMultiMap* _tmp0_ = NULL; + GeeHashMultiMap* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -872,11 +880,11 @@ 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 876 "ContainerSourceCollection.c" +#line 884 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp1_ = unlinking; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -885,17 +893,17 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _source_it = _tmp2_; #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 889 "ContainerSourceCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 897 "ContainerSourceCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; GeeCollection* containers = NULL; - DataSource* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; + DataSource* _tmp7_; + GeeCollection* _tmp8_; gboolean _tmp9_ = FALSE; - GeeCollection* _tmp10_ = NULL; + 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" @@ -904,7 +912,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (!_tmp4_) { #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 908 "ContainerSourceCollection.c" +#line 916 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp5_ = _source_it; @@ -924,11 +932,11 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (_tmp10_ == NULL) { #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp9_ = TRUE; -#line 928 "ContainerSourceCollection.c" +#line 936 "ContainerSourceCollection.c" } else { - GeeCollection* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + GeeCollection* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp11_ = containers; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -937,7 +945,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _tmp13_ = _tmp12_; #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp9_ = _tmp13_ == 0; -#line 941 "ContainerSourceCollection.c" +#line 949 "ContainerSourceCollection.c" } #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp9_) { @@ -947,12 +955,12 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _g_object_unref0 (source); #line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 951 "ContainerSourceCollection.c" +#line 959 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeCollection* _tmp14_ = NULL; - GeeIterator* _tmp15_ = NULL; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp14_ = containers; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -961,19 +969,19 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _container_it = _tmp15_; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 965 "ContainerSourceCollection.c" - GeeIterator* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 973 "ContainerSourceCollection.c" + GeeIterator* _tmp16_; + gboolean _tmp17_; ContainerSource* container = NULL; - GeeIterator* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - GeeHashMultiMap* _tmp20_ = NULL; - ContainerSource* _tmp21_ = NULL; - DataSource* _tmp22_ = NULL; - DataSource* _tmp23_ = NULL; - ContainerSource* _tmp24_ = NULL; - SourceBacklink* _tmp25_ = NULL; - SourceBacklink* _tmp26_ = NULL; + GeeIterator* _tmp18_; + gpointer _tmp19_; + GeeHashMultiMap* _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; #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -982,7 +990,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (!_tmp17_) { #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 986 "ContainerSourceCollection.c" +#line 994 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp18_ = _container_it; @@ -1012,29 +1020,29 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _source_backlink_unref0 (_tmp26_); #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1016 "ContainerSourceCollection.c" +#line 1024 "ContainerSourceCollection.c" } #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1020 "ContainerSourceCollection.c" +#line 1028 "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 1026 "ContainerSourceCollection.c" +#line 1034 "ContainerSourceCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1030 "ContainerSourceCollection.c" +#line 1038 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp27_ = NULL; - GeeSet* _tmp28_ = NULL; - GeeSet* _tmp29_ = NULL; - GeeIterator* _tmp30_ = NULL; - GeeIterator* _tmp31_ = NULL; + GeeHashMultiMap* _tmp27_; + GeeSet* _tmp28_; + GeeSet* _tmp29_; + GeeIterator* _tmp30_; + GeeIterator* _tmp31_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp27_ = map; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1051,17 +1059,17 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _container_it = _tmp31_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1055 "ContainerSourceCollection.c" - GeeIterator* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; +#line 1063 "ContainerSourceCollection.c" + GeeIterator* _tmp32_; + gboolean _tmp33_; ContainerSource* container = NULL; - GeeIterator* _tmp34_ = NULL; - gpointer _tmp35_ = NULL; - ContainerSource* _tmp36_ = NULL; - GeeHashMultiMap* _tmp37_ = NULL; - ContainerSource* _tmp38_ = NULL; - GeeCollection* _tmp39_ = NULL; - GeeCollection* _tmp40_ = NULL; + GeeIterator* _tmp34_; + gpointer _tmp35_; + ContainerSource* _tmp36_; + GeeHashMultiMap* _tmp37_; + ContainerSource* _tmp38_; + GeeCollection* _tmp39_; + GeeCollection* _tmp40_; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp32_ = _container_it; #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1070,7 +1078,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe if (!_tmp33_) { #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1074 "ContainerSourceCollection.c" +#line 1082 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp34_ = _container_it; @@ -1094,30 +1102,30 @@ static void container_source_collection_on_contained_sources_unlinking (Containe _g_object_unref0 (_tmp40_); #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1098 "ContainerSourceCollection.c" +#line 1106 "ContainerSourceCollection.c" } #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1102 "ContainerSourceCollection.c" +#line 1110 "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 1108 "ContainerSourceCollection.c" +#line 1116 "ContainerSourceCollection.c" } 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 1115 "ContainerSourceCollection.c" +#line 1123 "ContainerSourceCollection.c" } static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked) { GeeHashMultiMap* map = NULL; - GeeHashMultiMap* _tmp0_ = NULL; + GeeHashMultiMap* _tmp0_; #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1128,11 +1136,11 @@ 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 1132 "ContainerSourceCollection.c" +#line 1140 "ContainerSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp1_ = relinked; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1141,18 +1149,18 @@ static void container_source_collection_on_contained_sources_relinked (Container _source_it = _tmp2_; #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1145 "ContainerSourceCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1153 "ContainerSourceCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; GeeList* backlinks = NULL; - DataSource* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; + DataSource* _tmp7_; + const gchar* _tmp8_; + GeeList* _tmp9_; gboolean _tmp10_ = FALSE; - GeeList* _tmp11_ = NULL; + 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" @@ -1161,7 +1169,7 @@ static void container_source_collection_on_contained_sources_relinked (Container if (!_tmp4_) { #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1165 "ContainerSourceCollection.c" +#line 1173 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp5_ = _source_it; @@ -1183,11 +1191,11 @@ static void container_source_collection_on_contained_sources_relinked (Container if (_tmp11_ == NULL) { #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = TRUE; -#line 1187 "ContainerSourceCollection.c" +#line 1195 "ContainerSourceCollection.c" } else { - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp12_ = backlinks; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1196,7 +1204,7 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp14_ = _tmp13_; #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = _tmp14_ == 0; -#line 1200 "ContainerSourceCollection.c" +#line 1208 "ContainerSourceCollection.c" } #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp10_) { @@ -1206,16 +1214,16 @@ static void container_source_collection_on_contained_sources_relinked (Container _g_object_unref0 (source); #line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" continue; -#line 1210 "ContainerSourceCollection.c" +#line 1218 "ContainerSourceCollection.c" } { GeeList* _backlink_list = NULL; - GeeList* _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; + GeeList* _tmp15_; + GeeList* _tmp16_; gint _backlink_size = 0; - GeeList* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + GeeList* _tmp17_; + gint _tmp18_; + gint _tmp19_; gint _backlink_index = 0; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp15_ = backlinks; @@ -1235,18 +1243,18 @@ static void container_source_collection_on_contained_sources_relinked (Container _backlink_index = -1; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1239 "ContainerSourceCollection.c" - gint _tmp20_ = 0; - gint _tmp21_ = 0; - gint _tmp22_ = 0; +#line 1247 "ContainerSourceCollection.c" + gint _tmp20_; + gint _tmp21_; + gint _tmp22_; SourceBacklink* backlink = NULL; - GeeList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gpointer _tmp25_ = NULL; + GeeList* _tmp23_; + gint _tmp24_; + gpointer _tmp25_; ContainerSource* container = NULL; - SourceBacklink* _tmp26_ = NULL; - ContainerSource* _tmp27_ = NULL; - ContainerSource* _tmp28_ = NULL; + SourceBacklink* _tmp26_; + ContainerSource* _tmp27_; + ContainerSource* _tmp28_; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp20_ = _backlink_index; #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1259,7 +1267,7 @@ static void container_source_collection_on_contained_sources_relinked (Container if (!(_tmp21_ < _tmp22_)) { #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1263 "ContainerSourceCollection.c" +#line 1271 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp23_ = _backlink_list; @@ -1279,10 +1287,10 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp28_ = container; #line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp28_ != NULL) { -#line 1283 "ContainerSourceCollection.c" - GeeHashMultiMap* _tmp29_ = NULL; - ContainerSource* _tmp30_ = NULL; - DataSource* _tmp31_ = NULL; +#line 1291 "ContainerSourceCollection.c" + GeeHashMultiMap* _tmp29_; + ContainerSource* _tmp30_; + DataSource* _tmp31_; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp29_ = map; #line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1291,14 +1299,14 @@ static void container_source_collection_on_contained_sources_relinked (Container _tmp31_ = 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 1295 "ContainerSourceCollection.c" +#line 1303 "ContainerSourceCollection.c" } else { - DataSource* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - SourceBacklink* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; + DataSource* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + SourceBacklink* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp32_ = source; #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1318,35 +1326,35 @@ static void container_source_collection_on_contained_sources_relinked (Container _g_free0 (_tmp37_); #line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_free0 (_tmp34_); -#line 1321 "ContainerSourceCollection.c" +#line 1329 "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 1327 "ContainerSourceCollection.c" +#line 1335 "ContainerSourceCollection.c" } #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_backlink_list); -#line 1331 "ContainerSourceCollection.c" +#line 1339 "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 1337 "ContainerSourceCollection.c" +#line 1345 "ContainerSourceCollection.c" } #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_source_it); -#line 1341 "ContainerSourceCollection.c" +#line 1349 "ContainerSourceCollection.c" } { GeeIterator* _container_it = NULL; - GeeHashMultiMap* _tmp38_ = NULL; - GeeSet* _tmp39_ = NULL; - GeeSet* _tmp40_ = NULL; - GeeIterator* _tmp41_ = NULL; - GeeIterator* _tmp42_ = NULL; + GeeHashMultiMap* _tmp38_; + GeeSet* _tmp39_; + GeeSet* _tmp40_; + GeeIterator* _tmp41_; + GeeIterator* _tmp42_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp38_ = map; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1363,17 +1371,17 @@ static void container_source_collection_on_contained_sources_relinked (Container _container_it = _tmp42_; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1366 "ContainerSourceCollection.c" - GeeIterator* _tmp43_ = NULL; - gboolean _tmp44_ = FALSE; +#line 1374 "ContainerSourceCollection.c" + GeeIterator* _tmp43_; + gboolean _tmp44_; ContainerSource* container = NULL; - GeeIterator* _tmp45_ = NULL; - gpointer _tmp46_ = NULL; - ContainerSource* _tmp47_ = NULL; - GeeHashMultiMap* _tmp48_ = NULL; - ContainerSource* _tmp49_ = NULL; - GeeCollection* _tmp50_ = NULL; - GeeCollection* _tmp51_ = 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; #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1382,7 +1390,7 @@ static void container_source_collection_on_contained_sources_relinked (Container if (!_tmp44_) { #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1385 "ContainerSourceCollection.c" +#line 1393 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp45_ = _container_it; @@ -1406,24 +1414,24 @@ static void container_source_collection_on_contained_sources_relinked (Container _g_object_unref0 (_tmp51_); #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1409 "ContainerSourceCollection.c" +#line 1417 "ContainerSourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_container_it); -#line 1413 "ContainerSourceCollection.c" +#line 1421 "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 1419 "ContainerSourceCollection.c" +#line 1427 "ContainerSourceCollection.c" } static void container_source_collection_on_contained_source_destroyed (ContainerSourceCollection* self, DataSource* source) { GeeIterator* iter = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1436,15 +1444,15 @@ 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 1439 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1447 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; ContainerSource* container = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; gboolean _tmp6_ = FALSE; - ContainerSource* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + ContainerSource* _tmp7_; + gboolean _tmp8_; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = iter; #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1453,7 +1461,7 @@ static void container_source_collection_on_contained_source_destroyed (Container if (!_tmp3_) { #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1456 "ContainerSourceCollection.c" +#line 1464 "ContainerSourceCollection.c" } #line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = iter; @@ -1467,23 +1475,23 @@ static void container_source_collection_on_contained_source_destroyed (Container _tmp8_ = container_source_has_links (_tmp7_); #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (!_tmp8_) { -#line 1470 "ContainerSourceCollection.c" - ContainerSource* _tmp9_ = NULL; +#line 1478 "ContainerSourceCollection.c" + ContainerSource* _tmp9_; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp9_ = container; #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp6_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_TAG); -#line 1476 "ContainerSourceCollection.c" +#line 1484 "ContainerSourceCollection.c" } else { #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp6_ = FALSE; -#line 1480 "ContainerSourceCollection.c" +#line 1488 "ContainerSourceCollection.c" } #line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp6_) { -#line 1484 "ContainerSourceCollection.c" - GeeIterator* _tmp10_ = NULL; - ContainerSource* _tmp11_ = NULL; +#line 1492 "ContainerSourceCollection.c" + GeeIterator* _tmp10_; + ContainerSource* _tmp11_; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp10_ = iter; #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1492,30 +1500,30 @@ static void container_source_collection_on_contained_source_destroyed (Container _tmp11_ = 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 1495 "ContainerSourceCollection.c" +#line 1503 "ContainerSourceCollection.c" } #line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (container); -#line 1499 "ContainerSourceCollection.c" +#line 1507 "ContainerSourceCollection.c" } #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (iter); -#line 1503 "ContainerSourceCollection.c" +#line 1511 "ContainerSourceCollection.c" } static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source) { ContainerSourceCollection * self; - DataSource* _tmp10_ = NULL; + 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 1514 "ContainerSourceCollection.c" +#line 1522 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1524,16 +1532,16 @@ 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 1527 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1535 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; - SourceBacklink* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; + DataSource* _tmp7_; + SourceBacklink* _tmp8_; + SourceBacklink* _tmp9_; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1542,7 +1550,7 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec if (!_tmp3_) { #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1545 "ContainerSourceCollection.c" +#line 1553 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -1564,33 +1572,33 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec _source_backlink_unref0 (_tmp9_); #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1567 "ContainerSourceCollection.c" +#line 1575 "ContainerSourceCollection.c" } #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1571 "ContainerSourceCollection.c" +#line 1579 "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 1577 "ContainerSourceCollection.c" +#line 1585 "ContainerSourceCollection.c" } void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container) { - ContainerSource* _tmp21_ = NULL; - Marker* _tmp22_ = NULL; - Marker* _tmp23_ = NULL; + ContainerSource* _tmp21_; + Marker* _tmp22_; + Marker* _tmp23_; #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 1589 "ContainerSourceCollection.c" +#line 1597 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1599,18 +1607,18 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _collection_it = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1602 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1610 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; - ContainerSource* _tmp7_ = NULL; - SourceBacklink* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; + ContainerSource* _tmp7_; + SourceBacklink* _tmp8_; + SourceBacklink* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1619,7 +1627,7 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con if (!_tmp3_) { #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1622 "ContainerSourceCollection.c" +#line 1630 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -1643,17 +1651,17 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _source_backlink_unref0 (_tmp9_); #line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" if (_tmp11_) { -#line 1646 "ContainerSourceCollection.c" - ContainerSource* _tmp12_ = NULL; - Marker* _tmp13_ = NULL; - Marker* _tmp14_ = NULL; - GeeCollection* _tmp15_ = NULL; - GeeCollection* _tmp16_ = NULL; +#line 1654 "ContainerSourceCollection.c" + ContainerSource* _tmp12_; + Marker* _tmp13_; + Marker* _tmp14_; + GeeCollection* _tmp15_; + GeeCollection* _tmp16_; gboolean added = FALSE; - GeeHashSet* _tmp17_ = NULL; - ContainerSource* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; + GeeHashSet* _tmp17_; + ContainerSource* _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp12_ = container; #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1686,15 +1694,15 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con _g_object_unref0 (_collection_it); #line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1689 "ContainerSourceCollection.c" +#line 1697 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1693 "ContainerSourceCollection.c" +#line 1701 "ContainerSourceCollection.c" } #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1697 "ContainerSourceCollection.c" +#line 1705 "ContainerSourceCollection.c" } #line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp21_ = container; @@ -1706,48 +1714,48 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con 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 1709 "ContainerSourceCollection.c" +#line 1717 "ContainerSourceCollection.c" } 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 1716 "ContainerSourceCollection.c" +#line 1724 "ContainerSourceCollection.c" } 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 1723 "ContainerSourceCollection.c" +#line 1731 "ContainerSourceCollection.c" } 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 1730 "ContainerSourceCollection.c" +#line 1738 "ContainerSourceCollection.c" } 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 1737 "ContainerSourceCollection.c" +#line 1745 "ContainerSourceCollection.c" } void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection) { - GeeHashSet* _tmp0_ = NULL; - SourceCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp8_ = NULL; - SourceCollection* _tmp9_ = NULL; - SourceCollection* _tmp10_ = NULL; - SourceCollection* _tmp11_ = NULL; - SourceCollection* _tmp12_ = NULL; - SourceCollection* _tmp13_ = NULL; + GeeHashSet* _tmp0_; + SourceCollection* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp8_; + SourceCollection* _tmp9_; + SourceCollection* _tmp10_; + SourceCollection* _tmp11_; + SourceCollection* _tmp12_; + SourceCollection* _tmp13_; #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" @@ -1760,12 +1768,12 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s _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 1763 "ContainerSourceCollection.c" - SourceCollection* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 1771 "ContainerSourceCollection.c" + SourceCollection* _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" @@ -1785,7 +1793,7 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s _g_free0 (_tmp5_); #line 216 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" return; -#line 1787 "ContainerSourceCollection.c" +#line 1795 "ContainerSourceCollection.c" } #line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp8_ = self->priv->attached_collections; @@ -1809,19 +1817,19 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s _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 1811 "ContainerSourceCollection.c" +#line 1819 "ContainerSourceCollection.c" } void container_source_collection_detach_all_collections (ContainerSourceCollection* self) { - GeeHashSet* _tmp14_ = NULL; + GeeHashSet* _tmp14_; #line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self)); -#line 1819 "ContainerSourceCollection.c" +#line 1827 "ContainerSourceCollection.c" { GeeIterator* _collection_it = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeIterator* _tmp1_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp0_ = self->priv->attached_collections; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1830,20 +1838,20 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti _collection_it = _tmp1_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" while (TRUE) { -#line 1832 "ContainerSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1840 "ContainerSourceCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; SourceCollection* collection = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; - guint _tmp7_ = 0U; - SourceCollection* _tmp8_ = NULL; - guint _tmp9_ = 0U; - SourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; - SourceCollection* _tmp12_ = NULL; - guint _tmp13_ = 0U; + GeeIterator* _tmp4_; + gpointer _tmp5_; + SourceCollection* _tmp6_; + guint _tmp7_; + SourceCollection* _tmp8_; + guint _tmp9_; + SourceCollection* _tmp10_; + guint _tmp11_; + SourceCollection* _tmp12_; + guint _tmp13_; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp2_ = _collection_it; #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -1852,7 +1860,7 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti if (!_tmp3_) { #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" break; -#line 1854 "ContainerSourceCollection.c" +#line 1862 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp4_ = _collection_it; @@ -1886,17 +1894,17 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti 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); #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _data_collection_unref0 (collection); -#line 1888 "ContainerSourceCollection.c" +#line 1896 "ContainerSourceCollection.c" } #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _g_object_unref0 (_collection_it); -#line 1892 "ContainerSourceCollection.c" +#line 1900 "ContainerSourceCollection.c" } #line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" _tmp14_ = 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 1898 "ContainerSourceCollection.c" +#line 1906 "ContainerSourceCollection.c" } @@ -1905,7 +1913,7 @@ static void container_source_collection_real_container_contents_added (Container 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 1907 "ContainerSourceCollection.c" +#line 1915 "ContainerSourceCollection.c" } @@ -1924,19 +1932,19 @@ 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 1926 "ContainerSourceCollection.c" +#line 1934 "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 1932 "ContainerSourceCollection.c" +#line 1940 "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 1938 "ContainerSourceCollection.c" +#line 1946 "ContainerSourceCollection.c" } @@ -1945,7 +1953,7 @@ static void container_source_collection_real_container_contents_removed (Contain 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 1947 "ContainerSourceCollection.c" +#line 1955 "ContainerSourceCollection.c" } @@ -1956,7 +1964,7 @@ static void container_source_collection_real_container_contents_altered (Contain 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 1958 "ContainerSourceCollection.c" +#line 1966 "ContainerSourceCollection.c" } @@ -1975,19 +1983,19 @@ 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 1977 "ContainerSourceCollection.c" +#line 1985 "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 1983 "ContainerSourceCollection.c" +#line 1991 "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 1989 "ContainerSourceCollection.c" +#line 1997 "ContainerSourceCollection.c" } @@ -1996,7 +2004,7 @@ static void container_source_collection_real_backlink_to_container_removed (Cont 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 1998 "ContainerSourceCollection.c" +#line 2006 "ContainerSourceCollection.c" } @@ -2015,19 +2023,19 @@ 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 2017 "ContainerSourceCollection.c" +#line 2025 "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 2023 "ContainerSourceCollection.c" +#line 2031 "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 2029 "ContainerSourceCollection.c" +#line 2037 "ContainerSourceCollection.c" } @@ -2039,21 +2047,21 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" g_type_class_add_private (klass, sizeof (ContainerSourceCollectionPrivate)); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) container_source_collection_real_notify_backlink_removed; + ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*) (SourceCollection *, SourceBacklink*, GeeCollection*)) container_source_collection_real_notify_backlink_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_added; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_added; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_removed; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_altered; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*, gboolean, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_altered; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*)) container_source_collection_real_notify_backlink_to_container_removed; + ((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = (void (*) (ContainerSourceCollection *, ContainerSource*, GeeCollection*)) container_source_collection_real_notify_backlink_to_container_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) container_source_collection_real_get_containers_holding_source; + ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*) (ContainerSourceCollection *, DataSource*)) container_source_collection_real_get_containers_holding_source; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) container_source_collection_real_convert_backlink_to_container; + ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*) (ContainerSourceCollection *, SourceBacklink*)) container_source_collection_real_convert_backlink_to_container; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) container_source_collection_real_notify_item_destroyed; + ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*) (SourceCollection *, DataSource*)) container_source_collection_real_notify_item_destroyed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" ((ContainerSourceCollectionClass *) klass)->container_contents_added = container_source_collection_real_container_contents_added; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2063,20 +2071,20 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" ((ContainerSourceCollectionClass *) klass)->backlink_to_container_removed = container_source_collection_real_backlink_to_container_removed; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_new ("container_contents_added", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_added), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); + container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_ADDED_SIGNAL] = g_signal_new ("container-contents-added", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_added), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - g_signal_new ("container_contents_removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); + container_source_collection_signals[CONTAINER_SOURCE_COLLECTION_CONTAINER_CONTENTS_REMOVED_SIGNAL] = g_signal_new ("container-contents-removed", TYPE_CONTAINER_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ContainerSourceCollectionClass, container_contents_removed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN, G_TYPE_NONE, 3, TYPE_CONTAINER_SOURCE, GEE_TYPE_COLLECTION, G_TYPE_BOOLEAN); #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" - 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); + 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" - 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 2072 "ContainerSourceCollection.c" + 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" } static void container_source_collection_instance_init (ContainerSourceCollection * self) { - GeeHashSet* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeHashSet* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" self->priv = CONTAINER_SOURCE_COLLECTION_GET_PRIVATE (self); #line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala" @@ -2087,11 +2095,11 @@ 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 2089 "ContainerSourceCollection.c" +#line 2097 "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); @@ -2105,7 +2113,7 @@ 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 2107 "ContainerSourceCollection.c" +#line 2115 "ContainerSourceCollection.c" } diff --git a/src/core/Core.c b/src/core/Core.c index d67d1ab..bb3c27b 100644 --- a/src/core/Core.c +++ b/src/core/Core.c @@ -1,4 +1,4 @@ -/* Core.c generated by valac 0.34.7, the Vala compiler +/* Core.c generated by valac 0.36.6, the Vala compiler * generated from Core.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c index 21c509f..658dfa3 100644 --- a/src/core/DataCollection.c +++ b/src/core/DataCollection.c @@ -1,4 +1,4 @@ -/* DataCollection.c generated by valac 0.34.7, the Vala compiler +/* DataCollection.c generated by valac 0.36.6, the Vala compiler * generated from DataCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -91,6 +91,19 @@ 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))) typedef struct _ParamSpecDataCollection ParamSpecDataCollection; +enum { + DATA_COLLECTION_ITEMS_ADDED_SIGNAL, + DATA_COLLECTION_ITEMS_REMOVED_SIGNAL, + DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL, + DATA_COLLECTION_ITEMS_ALTERED_SIGNAL, + DATA_COLLECTION_ORDERING_CHANGED_SIGNAL, + DATA_COLLECTION_PROPERTY_SET_SIGNAL, + DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL, + DATA_COLLECTION_FROZEN_SIGNAL, + DATA_COLLECTION_THAWED_SIGNAL, + DATA_COLLECTION_LAST_SIGNAL +}; +static guint data_collection_signals[DATA_COLLECTION_LAST_SIGNAL] = {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; } @@ -185,7 +198,7 @@ struct _ParamSpecDataCollection { static gpointer data_collection_parent_class = NULL; static gpointer data_collection_marker_impl_parent_class = NULL; -static MarkerIface* data_collection_marker_impl_marker_parent_iface = NULL; +static MarkerIface * data_collection_marker_impl_marker_parent_iface = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); @@ -331,7 +344,7 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa 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_BOXED_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); 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); @@ -348,14 +361,14 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle 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); -static void data_collection_marker_impl_finalize (GObject* obj); -static void data_collection_finalize (DataCollection* obj); +static void data_collection_marker_impl_finalize (GObject * obj); +static void data_collection_finalize (DataCollection * obj); 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 359 "DataCollection.c" +#line 372 "DataCollection.c" } @@ -364,14 +377,14 @@ static void _vala_GValue_free (GValue* self) { g_value_unset (self); #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_free (self); -#line 368 "DataCollection.c" +#line 381 "DataCollection.c" } DataCollection* data_collection_construct (GType object_type, const gchar* name) { DataCollection* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #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" @@ -386,22 +399,22 @@ DataCollection* data_collection_construct (GType object_type, const gchar* name) self->priv->name = _tmp1_; #line 157 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self; -#line 390 "DataCollection.c" +#line 403 "DataCollection.c" } 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 397 "DataCollection.c" +#line 410 "DataCollection.c" } static gchar* data_collection_real_to_string (DataCollection* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + gint _tmp1_; + gchar* _tmp2_; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->name; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -412,7 +425,7 @@ static gchar* data_collection_real_to_string (DataCollection* self) { result = _tmp2_; #line 168 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 416 "DataCollection.c" +#line 429 "DataCollection.c" } @@ -421,19 +434,19 @@ gchar* data_collection_to_string (DataCollection* self) { 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 425 "DataCollection.c" +#line 438 "DataCollection.c" } static void data_collection_real_notify_items_added (DataCollection* self, GeeIterable* added) { - GeeIterable* _tmp0_ = NULL; + GeeIterable* _tmp0_; #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_by_name (self, "items-added", _tmp0_); -#line 437 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL], 0, _tmp0_); +#line 450 "DataCollection.c" } @@ -442,19 +455,19 @@ void data_collection_notify_items_added (DataCollection* self, GeeIterable* adde 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 446 "DataCollection.c" +#line 459 "DataCollection.c" } static void data_collection_real_notify_items_removed (DataCollection* self, GeeIterable* removed) { - GeeIterable* _tmp0_ = NULL; + GeeIterable* _tmp0_; #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_by_name (self, "items-removed", _tmp0_); -#line 458 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL], 0, _tmp0_); +#line 471 "DataCollection.c" } @@ -463,13 +476,13 @@ void data_collection_notify_items_removed (DataCollection* self, GeeIterable* re 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 467 "DataCollection.c" +#line 480 "DataCollection.c" } static void data_collection_real_notify_contents_altered (DataCollection* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_ = NULL; - GeeIterable* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterable* _tmp1_; #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" @@ -479,8 +492,8 @@ static void data_collection_real_notify_contents_altered (DataCollection* self, #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_by_name (self, "contents-altered", _tmp0_, _tmp1_); -#line 484 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL], 0, _tmp0_, _tmp1_); +#line 497 "DataCollection.c" } @@ -489,19 +502,19 @@ void data_collection_notify_contents_altered (DataCollection* self, GeeIterable* 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 493 "DataCollection.c" +#line 506 "DataCollection.c" } static void data_collection_real_notify_items_altered (DataCollection* self, GeeMap* items) { - GeeMap* _tmp0_ = NULL; + GeeMap* _tmp0_; #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_by_name (self, "items-altered", _tmp0_); -#line 505 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL], 0, _tmp0_); +#line 518 "DataCollection.c" } @@ -510,14 +523,14 @@ void data_collection_notify_items_altered (DataCollection* self, GeeMap* items) 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 514 "DataCollection.c" +#line 527 "DataCollection.c" } static void data_collection_real_notify_ordering_changed (DataCollection* self) { #line 190 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit_by_name (self, "ordering-changed"); -#line 521 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL], 0); +#line 534 "DataCollection.c" } @@ -526,14 +539,14 @@ void data_collection_notify_ordering_changed (DataCollection* self) { 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 530 "DataCollection.c" +#line 543 "DataCollection.c" } static void data_collection_real_notify_property_set (DataCollection* self, const gchar* name, GValue* old, GValue* val) { - const gchar* _tmp0_ = NULL; - GValue* _tmp1_ = NULL; - GValue _tmp2_ = {0}; + const gchar* _tmp0_; + GValue* _tmp1_; + GValue _tmp2_; #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" @@ -545,8 +558,8 @@ static void data_collection_real_notify_property_set (DataCollection* self, cons #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp2_ = *val; #line 194 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit_by_name (self, "property-set", _tmp0_, _tmp1_, &_tmp2_); -#line 550 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL], 0, _tmp0_, _tmp1_, &_tmp2_); +#line 563 "DataCollection.c" } @@ -555,19 +568,19 @@ void data_collection_notify_property_set (DataCollection* self, const gchar* nam 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 559 "DataCollection.c" +#line 572 "DataCollection.c" } static void data_collection_real_notify_property_cleared (DataCollection* self, const gchar* name) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #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_by_name (self, "property-cleared", _tmp0_); -#line 571 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL], 0, _tmp0_); +#line 584 "DataCollection.c" } @@ -576,14 +589,14 @@ void data_collection_notify_property_cleared (DataCollection* self, const gchar* 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 580 "DataCollection.c" +#line 593 "DataCollection.c" } GeeCollection* data_collection_get_singleton (DataObject* object) { GeeCollection* result = NULL; - DataObject* _tmp0_ = NULL; - SingletonCollection* _tmp1_ = NULL; + DataObject* _tmp0_; + SingletonCollection* _tmp1_; #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" @@ -594,16 +607,16 @@ GeeCollection* data_collection_get_singleton (DataObject* object) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 598 "DataCollection.c" +#line 611 "DataCollection.c" } GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration* alteration) { GeeMap* result = NULL; GeeMap* map = NULL; - GeeHashMap* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - Alteration* _tmp2_ = 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" @@ -622,7 +635,7 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration result = map; #line 215 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 626 "DataCollection.c" +#line 639 "DataCollection.c" } @@ -634,7 +647,7 @@ 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 638 "DataCollection.c" +#line 651 "DataCollection.c" } @@ -643,17 +656,17 @@ gboolean data_collection_valid_type (DataCollection* self, DataObject* object) { 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 647 "DataCollection.c" +#line 660 "DataCollection.c" } Comparator data_collection_get_comparator (DataCollection* self, void** result_target) { Comparator result = NULL; - DataSet* _tmp0_ = NULL; - void* _tmp1_ = NULL; - Comparator _tmp2_ = NULL; - Comparator _tmp3_ = NULL; - void* _tmp3__target = NULL; + DataSet* _tmp0_; + void* _tmp1_; + Comparator _tmp2_; + Comparator _tmp3_; + void* _tmp3__target; #line 222 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 223 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -670,17 +683,17 @@ 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 674 "DataCollection.c" +#line 687 "DataCollection.c" } ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* self, void** result_target) { ComparatorPredicate result = NULL; - DataSet* _tmp0_ = NULL; - void* _tmp1_ = NULL; - ComparatorPredicate _tmp2_ = NULL; - ComparatorPredicate _tmp3_ = NULL; - void* _tmp3__target = NULL; + DataSet* _tmp0_; + void* _tmp1_; + ComparatorPredicate _tmp2_; + ComparatorPredicate _tmp3_; + void* _tmp3__target; #line 226 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -697,16 +710,16 @@ ComparatorPredicate data_collection_get_comparator_predicate (DataCollection* se result = _tmp3_; #line 227 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 701 "DataCollection.c" +#line 714 "DataCollection.c" } static void data_collection_real_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { - DataSet* _tmp0_ = NULL; - Comparator _tmp1_ = NULL; - void* _tmp1__target = NULL; - ComparatorPredicate _tmp2_ = NULL; - void* _tmp2__target = NULL; + 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" @@ -721,7 +734,7 @@ static void data_collection_real_set_comparator (DataCollection* self, Comparato data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); #line 232 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 725 "DataCollection.c" +#line 738 "DataCollection.c" } @@ -730,19 +743,19 @@ void data_collection_set_comparator (DataCollection* self, Comparator comparator 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 734 "DataCollection.c" +#line 747 "DataCollection.c" } static void data_collection_real_reset_comparator (DataCollection* self) { - DataSet* _tmp0_ = NULL; + DataSet* _tmp0_; #line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 237 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_set_reset_comparator (_tmp0_); #line 238 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 746 "DataCollection.c" +#line 759 "DataCollection.c" } @@ -751,14 +764,14 @@ void data_collection_reset_comparator (DataCollection* self) { 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 755 "DataCollection.c" +#line 768 "DataCollection.c" } static GeeCollection* data_collection_real_get_all (DataCollection* self) { GeeCollection* result = NULL; - DataSet* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + DataSet* _tmp0_; + GeeList* _tmp1_; #line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 242 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -767,7 +780,7 @@ 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 771 "DataCollection.c" +#line 784 "DataCollection.c" } @@ -776,14 +789,14 @@ GeeCollection* data_collection_get_all (DataCollection* self) { 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 780 "DataCollection.c" +#line 793 "DataCollection.c" } DataSet* data_collection_get_dataset_copy (DataCollection* self) { DataSet* result = NULL; - DataSet* _tmp0_ = NULL; - DataSet* _tmp1_ = NULL; + DataSet* _tmp0_; + DataSet* _tmp1_; #line 245 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -794,14 +807,14 @@ DataSet* data_collection_get_dataset_copy (DataCollection* self) { result = _tmp1_; #line 246 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 798 "DataCollection.c" +#line 811 "DataCollection.c" } static gint data_collection_real_get_count (DataCollection* self) { gint result = 0; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 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" @@ -810,7 +823,7 @@ static gint data_collection_real_get_count (DataCollection* self) { result = _tmp1_; #line 250 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 814 "DataCollection.c" +#line 827 "DataCollection.c" } @@ -819,15 +832,15 @@ gint data_collection_get_count (DataCollection* self) { 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 823 "DataCollection.c" +#line 836 "DataCollection.c" } static DataObject* data_collection_real_get_at (DataCollection* self, gint index) { DataObject* result = NULL; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 0; - DataObject* _tmp2_ = NULL; + DataSet* _tmp0_; + gint _tmp1_; + DataObject* _tmp2_; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -838,7 +851,7 @@ static DataObject* data_collection_real_get_at (DataCollection* self, gint index result = _tmp2_; #line 254 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 842 "DataCollection.c" +#line 855 "DataCollection.c" } @@ -847,15 +860,15 @@ DataObject* data_collection_get_at (DataCollection* self, gint index) { 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 851 "DataCollection.c" +#line 864 "DataCollection.c" } static gint data_collection_real_index_of (DataCollection* self, DataObject* object) { gint result = 0; - DataSet* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gint _tmp2_ = 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" @@ -868,7 +881,7 @@ static gint data_collection_real_index_of (DataCollection* self, DataObject* obj result = _tmp2_; #line 258 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 872 "DataCollection.c" +#line 885 "DataCollection.c" } @@ -877,14 +890,14 @@ gint data_collection_index_of (DataCollection* self, DataObject* object) { 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 881 "DataCollection.c" +#line 894 "DataCollection.c" } static gboolean data_collection_real_contains (DataCollection* self, DataObject* object) { gboolean result = FALSE; - DataObject* _tmp0_ = NULL; - gboolean _tmp1_ = 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" @@ -895,7 +908,7 @@ static gboolean data_collection_real_contains (DataCollection* self, DataObject* result = _tmp1_; #line 262 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 899 "DataCollection.c" +#line 912 "DataCollection.c" } @@ -904,18 +917,18 @@ gboolean data_collection_contains (DataCollection* self, DataObject* object) { 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 908 "DataCollection.c" +#line 921 "DataCollection.c" } static gboolean data_collection_internal_contains (DataCollection* self, DataObject* object) { gboolean result = FALSE; - DataSet* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - DataObject* _tmp3_ = NULL; - DataCollection* _tmp4_ = NULL; - DataCollection* _tmp5_ = NULL; + DataSet* _tmp0_; + DataObject* _tmp1_; + gboolean _tmp2_; + DataObject* _tmp3_; + DataCollection* _tmp4_; + DataCollection* _tmp5_; #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" @@ -932,7 +945,7 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj result = FALSE; #line 269 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 936 "DataCollection.c" +#line 949 "DataCollection.c" } #line 271 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp3_ = object; @@ -948,19 +961,19 @@ static gboolean data_collection_internal_contains (DataCollection* self, DataObj result = TRUE; #line 273 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 952 "DataCollection.c" +#line 965 "DataCollection.c" } static void data_collection_internal_add (DataCollection* self, DataObject* object) { - DataObject* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - DataObject* _tmp2_ = NULL; - gint64 _tmp3_ = 0LL; + DataObject* _tmp0_; + gboolean _tmp1_; + DataObject* _tmp2_; + gint64 _tmp3_; gboolean added = FALSE; - DataSet* _tmp4_ = NULL; - DataObject* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + DataSet* _tmp4_; + DataObject* _tmp5_; + gboolean _tmp6_; #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" @@ -989,19 +1002,19 @@ static void data_collection_internal_add (DataCollection* self, DataObject* obje added = _tmp6_; #line 282 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (added, "added"); -#line 993 "DataCollection.c" +#line 1006 "DataCollection.c" } static void data_collection_internal_add_many (DataCollection* self, GeeList* objects, ProgressMonitor monitor, void* monitor_target) { gint count = 0; - GeeList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeList* _tmp0_; + gint _tmp1_; + gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp18_ = NULL; - GeeList* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + DataSet* _tmp18_; + GeeList* _tmp19_; + gboolean _tmp20_; #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" @@ -1014,40 +1027,40 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob _tmp2_ = _tmp1_; #line 286 "/home/jens/Source/shotwell/src/core/DataCollection.vala" count = _tmp2_; -#line 1018 "DataCollection.c" +#line 1031 "DataCollection.c" { gint ctr = 0; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 1023 "DataCollection.c" +#line 1036 "DataCollection.c" { gboolean _tmp3_ = FALSE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp3_ = TRUE; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1030 "DataCollection.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; +#line 1043 "DataCollection.c" + gint _tmp5_; + gint _tmp6_; DataObject* object = NULL; - GeeList* _tmp7_ = NULL; - gint _tmp8_ = 0; - gpointer _tmp9_ = NULL; - DataObject* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - DataObject* _tmp12_ = NULL; - gint64 _tmp13_ = 0LL; - ProgressMonitor _tmp14_ = NULL; - void* _tmp14__target = NULL; + GeeList* _tmp7_; + gint _tmp8_; + gpointer _tmp9_; + DataObject* _tmp10_; + gboolean _tmp11_; + DataObject* _tmp12_; + gint64 _tmp13_; + ProgressMonitor _tmp14_; + void* _tmp14__target; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!_tmp3_) { -#line 1045 "DataCollection.c" - gint _tmp4_ = 0; +#line 1058 "DataCollection.c" + gint _tmp4_; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = ctr; #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = _tmp4_ + 1; -#line 1051 "DataCollection.c" +#line 1064 "DataCollection.c" } #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp3_ = FALSE; @@ -1059,7 +1072,7 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob if (!(_tmp5_ < _tmp6_)) { #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1063 "DataCollection.c" +#line 1076 "DataCollection.c" } #line 288 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp7_ = objects; @@ -1089,11 +1102,11 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob _tmp14__target = monitor_target; #line 293 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp14_ != NULL) { -#line 1093 "DataCollection.c" - ProgressMonitor _tmp15_ = NULL; - void* _tmp15__target = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; +#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; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1104,11 +1117,11 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob _tmp17_ = count; #line 294 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp15_ ((guint64) _tmp16_, (guint64) _tmp17_, TRUE, _tmp15__target); -#line 1108 "DataCollection.c" +#line 1121 "DataCollection.c" } #line 287 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1112 "DataCollection.c" +#line 1125 "DataCollection.c" } } } @@ -1122,16 +1135,16 @@ static void data_collection_internal_add_many (DataCollection* self, GeeList* ob added = _tmp20_; #line 298 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _vala_assert (added, "added"); -#line 1126 "DataCollection.c" +#line 1139 "DataCollection.c" } static void data_collection_internal_remove (DataCollection* self, DataObject* object) { gboolean removed = FALSE; - DataSet* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - DataObject* _tmp3_ = NULL; + 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" @@ -1150,21 +1163,21 @@ static void data_collection_internal_remove (DataCollection* self, DataObject* o _tmp3_ = object; #line 305 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_object_internal_clear_membership (_tmp3_); -#line 1154 "DataCollection.c" +#line 1167 "DataCollection.c" } static gboolean data_collection_real_add (DataCollection* self, DataObject* object) { gboolean result = FALSE; - DataObject* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - DataObject* _tmp7_ = NULL; + DataObject* _tmp0_; + gboolean _tmp1_; + DataObject* _tmp7_; GeeCollection* added = NULL; - DataObject* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; - DataObject* _tmp12_ = NULL; + DataObject* _tmp8_; + GeeCollection* _tmp9_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; + DataObject* _tmp12_; #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" @@ -1173,12 +1186,12 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje _tmp1_ = data_collection_internal_contains (self, _tmp0_); #line 310 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp1_) { -#line 1177 "DataCollection.c" - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - DataObject* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 1190 "DataCollection.c" + 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" @@ -1199,7 +1212,7 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje result = FALSE; #line 313 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1203 "DataCollection.c" +#line 1216 "DataCollection.c" } #line 316 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp7_ = object; @@ -1229,7 +1242,7 @@ static gboolean data_collection_real_add (DataCollection* self, DataObject* obje _g_object_unref0 (added); #line 326 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1233 "DataCollection.c" +#line 1246 "DataCollection.c" } @@ -1238,35 +1251,35 @@ gboolean data_collection_add (DataCollection* self, DataObject* object) { 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 1242 "DataCollection.c" +#line 1255 "DataCollection.c" } static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target) { GeeCollection* result = NULL; GeeArrayList* added = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; gint count = 0; - GeeArrayList* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - GeeArrayList* _tmp20_ = NULL; - ProgressMonitor _tmp21_ = NULL; - void* _tmp21__target = NULL; - GeeArrayList* _tmp22_ = NULL; - GeeArrayList* _tmp23_ = NULL; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; + GeeArrayList* _tmp20_; + ProgressMonitor _tmp21_; + void* _tmp21__target; + GeeArrayList* _tmp22_; + GeeArrayList* _tmp23_; #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 1266 "DataCollection.c" +#line 1279 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp1_ = objects; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1275,16 +1288,16 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo _object_it = _tmp2_; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1279 "DataCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1292 "DataCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - GeeArrayList* _tmp14_ = NULL; - DataObject* _tmp15_ = 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; #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1293,7 +1306,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo if (!_tmp4_) { #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1297 "DataCollection.c" +#line 1310 "DataCollection.c" } #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp5_ = _object_it; @@ -1307,12 +1320,12 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo _tmp8_ = data_collection_internal_contains (self, _tmp7_); #line 334 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp8_) { -#line 1311 "DataCollection.c" - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 1324 "DataCollection.c" + 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); #line 335 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1333,7 +1346,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo _g_object_unref0 (object); #line 337 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1337 "DataCollection.c" +#line 1350 "DataCollection.c" } #line 340 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp14_ = added; @@ -1343,11 +1356,11 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1347 "DataCollection.c" +#line 1360 "DataCollection.c" } #line 333 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1351 "DataCollection.c" +#line 1364 "DataCollection.c" } #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp16_ = added; @@ -1365,7 +1378,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo result = G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_COLLECTION, GeeCollection); #line 345 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1369 "DataCollection.c" +#line 1382 "DataCollection.c" } #line 347 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp20_ = added; @@ -1383,34 +1396,34 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo _tmp23_ = 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 1387 "DataCollection.c" +#line 1400 "DataCollection.c" { gint ctr = 0; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 1392 "DataCollection.c" +#line 1405 "DataCollection.c" { gboolean _tmp24_ = FALSE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp24_ = TRUE; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1399 "DataCollection.c" - gint _tmp26_ = 0; - gint _tmp27_ = 0; - GeeArrayList* _tmp28_ = NULL; - gint _tmp29_ = 0; - gpointer _tmp30_ = NULL; - DataObject* _tmp31_ = NULL; +#line 1412 "DataCollection.c" + gint _tmp26_; + gint _tmp27_; + GeeArrayList* _tmp28_; + gint _tmp29_; + gpointer _tmp30_; + DataObject* _tmp31_; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!_tmp24_) { -#line 1408 "DataCollection.c" - gint _tmp25_ = 0; +#line 1421 "DataCollection.c" + gint _tmp25_; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp25_ = ctr; #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = _tmp25_ + 1; -#line 1414 "DataCollection.c" +#line 1427 "DataCollection.c" } #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp24_ = FALSE; @@ -1422,7 +1435,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo if (!(_tmp26_ < _tmp27_)) { #line 354 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1426 "DataCollection.c" +#line 1439 "DataCollection.c" } #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp28_ = added; @@ -1436,7 +1449,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo data_object_notify_membership_changed (_tmp31_, self); #line 355 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_tmp31_); -#line 1440 "DataCollection.c" +#line 1453 "DataCollection.c" } } } @@ -1444,7 +1457,7 @@ 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 1448 "DataCollection.c" +#line 1461 "DataCollection.c" } @@ -1453,13 +1466,13 @@ GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* ob 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 1457 "DataCollection.c" +#line 1470 "DataCollection.c" } Marker* data_collection_start_marking (DataCollection* self) { Marker* result = NULL; - DataCollectionMarkerImpl* _tmp0_ = NULL; + DataCollectionMarkerImpl* _tmp0_; #line 361 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), NULL); #line 362 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1468,15 +1481,15 @@ 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 1472 "DataCollection.c" +#line 1485 "DataCollection.c" } Marker* data_collection_mark (DataCollection* self, DataObject* object) { Marker* result = NULL; Marker* marker = NULL; - DataCollectionMarkerImpl* _tmp0_ = NULL; - DataObject* _tmp1_ = 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" @@ -1493,15 +1506,15 @@ Marker* data_collection_mark (DataCollection* self, DataObject* object) { result = marker; #line 370 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1497 "DataCollection.c" +#line 1510 "DataCollection.c" } Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) { Marker* result = NULL; Marker* marker = NULL; - DataCollectionMarkerImpl* _tmp0_ = NULL; - GeeCollection* _tmp1_ = 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" @@ -1518,31 +1531,31 @@ Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects) result = marker; #line 378 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 1522 "DataCollection.c" +#line 1535 "DataCollection.c" } 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 1529 "DataCollection.c" +#line 1542 "DataCollection.c" } 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_ = NULL; - DataCollectionMarkerImpl* _tmp1_ = NULL; - DataCollectionMarkerImpl* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - DataCollectionMarkerImpl* _tmp4_ = NULL; + Marker* _tmp0_; + DataCollectionMarkerImpl* _tmp1_; + DataCollectionMarkerImpl* _tmp2_; + gboolean _tmp3_; + DataCollectionMarkerImpl* _tmp4_; guint64 count = 0ULL; guint64 total = 0ULL; - DataCollectionMarkerImpl* _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - DataCollectionMarkerImpl* _tmp31_ = NULL; + DataCollectionMarkerImpl* _tmp5_; + GeeHashSet* _tmp6_; + gint _tmp7_; + gint _tmp8_; + DataCollectionMarkerImpl* _tmp31_; #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" @@ -1577,12 +1590,12 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio _tmp8_ = _tmp7_; #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala" total = (guint64) _tmp8_; -#line 1581 "DataCollection.c" +#line 1594 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp9_ = NULL; - GeeHashSet* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + DataCollectionMarkerImpl* _tmp9_; + GeeHashSet* _tmp10_; + GeeIterator* _tmp11_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp9_ = marker; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1593,21 +1606,21 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio _object_it = _tmp11_; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1597 "DataCollection.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 1610 "DataCollection.c" + GeeIterator* _tmp12_; + gboolean _tmp13_; DataObject* object = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; - DataObject* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - MarkedAction _tmp21_ = NULL; - void* _tmp21__target = NULL; - DataObject* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - ProgressMonitor _tmp25_ = NULL; - void* _tmp25__target = 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; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp12_ = _object_it; #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1616,7 +1629,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio if (!_tmp13_) { #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1620 "DataCollection.c" +#line 1633 "DataCollection.c" } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp14_ = _object_it; @@ -1630,10 +1643,10 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio _tmp17_ = data_collection_internal_contains (self, _tmp16_); #line 398 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!_tmp17_) { -#line 1634 "DataCollection.c" - DataObject* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; +#line 1647 "DataCollection.c" + DataObject* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp18_ = object; #line 399 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1649,7 +1662,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio _g_object_unref0 (object); #line 401 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1652 "DataCollection.c" +#line 1665 "DataCollection.c" } #line 404 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp21_ = action; @@ -1667,7 +1680,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio _g_object_unref0 (object); #line 405 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1670 "DataCollection.c" +#line 1683 "DataCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp25_ = monitor; @@ -1675,13 +1688,13 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio _tmp25__target = monitor_target; #line 407 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp25_ != NULL) { -#line 1678 "DataCollection.c" - ProgressMonitor _tmp26_ = NULL; - void* _tmp26__target = NULL; - guint64 _tmp27_ = 0ULL; - guint64 _tmp28_ = 0ULL; - guint64 _tmp29_ = 0ULL; - gboolean _tmp30_ = FALSE; +#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; #line 408 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1702,16 +1715,16 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio _g_object_unref0 (object); #line 409 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1705 "DataCollection.c" +#line 1718 "DataCollection.c" } } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1710 "DataCollection.c" +#line 1723 "DataCollection.c" } #line 396 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1714 "DataCollection.c" +#line 1727 "DataCollection.c" } #line 414 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp31_ = marker; @@ -1719,24 +1732,24 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio data_collection_marker_impl_finished (_tmp31_); #line 383 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (marker); -#line 1722 "DataCollection.c" +#line 1735 "DataCollection.c" } static void data_collection_real_remove_marked (DataCollection* self, Marker* m) { DataCollectionMarkerImpl* marker = NULL; - Marker* _tmp0_ = NULL; - DataCollectionMarkerImpl* _tmp1_ = NULL; - DataCollectionMarkerImpl* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - DataCollectionMarkerImpl* _tmp4_ = NULL; + Marker* _tmp0_; + DataCollectionMarkerImpl* _tmp1_; + DataCollectionMarkerImpl* _tmp2_; + gboolean _tmp3_; + DataCollectionMarkerImpl* _tmp4_; GeeArrayList* skipped = NULL; - GeeArrayList* _tmp22_ = NULL; - DataCollectionMarkerImpl* _tmp26_ = NULL; - GeeHashSet* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - DataCollectionMarkerImpl* _tmp42_ = NULL; + GeeArrayList* _tmp22_; + DataCollectionMarkerImpl* _tmp26_; + GeeHashSet* _tmp27_; + gint _tmp28_; + gint _tmp29_; + DataCollectionMarkerImpl* _tmp42_; #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" @@ -1757,12 +1770,12 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) data_collection_marker_impl_freeze (_tmp4_); #line 428 "/home/jens/Source/shotwell/src/core/DataCollection.vala" skipped = NULL; -#line 1760 "DataCollection.c" +#line 1773 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + DataCollectionMarkerImpl* _tmp5_; + GeeHashSet* _tmp6_; + GeeIterator* _tmp7_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp5_ = marker; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1773,15 +1786,15 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _object_it = _tmp7_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1776 "DataCollection.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 1789 "DataCollection.c" + GeeIterator* _tmp8_; + gboolean _tmp9_; DataObject* object = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - DataObject* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - DataObject* _tmp21_ = NULL; + GeeIterator* _tmp10_; + gpointer _tmp11_; + DataObject* _tmp12_; + gboolean _tmp13_; + DataObject* _tmp21_; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp8_ = _object_it; #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1790,7 +1803,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) if (!_tmp9_) { #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1793 "DataCollection.c" +#line 1806 "DataCollection.c" } #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp10_ = _object_it; @@ -1804,13 +1817,13 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _tmp13_ = data_collection_internal_contains (self, _tmp12_); #line 431 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!_tmp13_) { -#line 1807 "DataCollection.c" - DataObject* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - GeeArrayList* _tmp17_ = NULL; - GeeArrayList* _tmp19_ = NULL; - DataObject* _tmp20_ = NULL; +#line 1820 "DataCollection.c" + DataObject* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + GeeArrayList* _tmp17_; + GeeArrayList* _tmp19_; + DataObject* _tmp20_; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp14_ = object; #line 432 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1826,15 +1839,15 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _tmp17_ = skipped; #line 434 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp17_ == NULL) { -#line 1828 "DataCollection.c" - GeeArrayList* _tmp18_ = NULL; +#line 1841 "DataCollection.c" + GeeArrayList* _tmp18_; #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); #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 1836 "DataCollection.c" +#line 1849 "DataCollection.c" } #line 437 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp19_ = skipped; @@ -1846,7 +1859,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _g_object_unref0 (object); #line 439 "/home/jens/Source/shotwell/src/core/DataCollection.vala" continue; -#line 1848 "DataCollection.c" +#line 1861 "DataCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp21_ = object; @@ -1854,20 +1867,20 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) data_collection_internal_remove (self, _tmp21_); #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1856 "DataCollection.c" +#line 1869 "DataCollection.c" } #line 429 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1860 "DataCollection.c" +#line 1873 "DataCollection.c" } #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp22_ = skipped; #line 445 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp22_ != NULL) { -#line 1866 "DataCollection.c" - DataCollectionMarkerImpl* _tmp23_ = NULL; - GeeHashSet* _tmp24_ = NULL; - GeeArrayList* _tmp25_ = NULL; +#line 1879 "DataCollection.c" + DataCollectionMarkerImpl* _tmp23_; + GeeHashSet* _tmp24_; + GeeArrayList* _tmp25_; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp23_ = marker; #line 446 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1876,7 +1889,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _tmp25_ = 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 1878 "DataCollection.c" +#line 1891 "DataCollection.c" } #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp26_ = marker; @@ -1888,11 +1901,11 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _tmp29_ = _tmp28_; #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp29_ > 0) { -#line 1890 "DataCollection.c" - DataCollectionMarkerImpl* _tmp30_ = NULL; - GeeHashSet* _tmp31_ = NULL; - DataCollectionMarkerImpl* _tmp32_ = NULL; - GeeHashSet* _tmp33_ = NULL; +#line 1903 "DataCollection.c" + DataCollectionMarkerImpl* _tmp30_; + GeeHashSet* _tmp31_; + DataCollectionMarkerImpl* _tmp32_; + GeeHashSet* _tmp33_; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp30_ = marker; #line 450 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1905,12 +1918,12 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _tmp33_ = _tmp32_->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 1907 "DataCollection.c" +#line 1920 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollectionMarkerImpl* _tmp34_ = NULL; - GeeHashSet* _tmp35_ = NULL; - GeeIterator* _tmp36_ = NULL; + DataCollectionMarkerImpl* _tmp34_; + GeeHashSet* _tmp35_; + GeeIterator* _tmp36_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp34_ = marker; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1921,13 +1934,13 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _object_it = _tmp36_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 1923 "DataCollection.c" - GeeIterator* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; +#line 1936 "DataCollection.c" + GeeIterator* _tmp37_; + gboolean _tmp38_; DataObject* object = NULL; - GeeIterator* _tmp39_ = NULL; - gpointer _tmp40_ = NULL; - DataObject* _tmp41_ = NULL; + GeeIterator* _tmp39_; + gpointer _tmp40_; + DataObject* _tmp41_; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp37_ = _object_it; #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1936,7 +1949,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) if (!_tmp38_) { #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 1938 "DataCollection.c" +#line 1951 "DataCollection.c" } #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp39_ = _object_it; @@ -1950,11 +1963,11 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) data_object_notify_membership_changed (_tmp41_, NULL); #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 1952 "DataCollection.c" +#line 1965 "DataCollection.c" } #line 454 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 1956 "DataCollection.c" +#line 1969 "DataCollection.c" } } #line 459 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1965,7 +1978,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m) _g_object_unref0 (skipped); #line 419 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (marker); -#line 1967 "DataCollection.c" +#line 1980 "DataCollection.c" } @@ -1974,17 +1987,17 @@ void data_collection_remove_marked (DataCollection* self, Marker* m) { 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 1976 "DataCollection.c" +#line 1989 "DataCollection.c" } static void data_collection_real_clear (DataCollection* self) { - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 0; + DataSet* _tmp0_; + gint _tmp1_; GeeArrayList* removed = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeArrayList* _tmp12_ = NULL; - GeeArrayList* _tmp13_ = NULL; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp12_; + GeeArrayList* _tmp13_; #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->priv->dataset; #line 463 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -1993,32 +2006,32 @@ static void data_collection_real_clear (DataCollection* self) { if (_tmp1_ == 0) { #line 464 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 1995 "DataCollection.c" +#line 2008 "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); #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala" removed = _tmp2_; -#line 2001 "DataCollection.c" +#line 2014 "DataCollection.c" { gboolean _tmp3_ = FALSE; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp3_ = TRUE; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2008 "DataCollection.c" +#line 2021 "DataCollection.c" DataObject* object = NULL; - DataSet* _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; - DataObject* _tmp8_ = NULL; - GeeArrayList* _tmp9_ = NULL; - DataObject* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; + DataSet* _tmp6_; + DataObject* _tmp7_; + DataObject* _tmp8_; + GeeArrayList* _tmp9_; + DataObject* _tmp10_; + DataObject* _tmp11_; #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!_tmp3_) { -#line 2018 "DataCollection.c" - DataSet* _tmp4_ = NULL; - gint _tmp5_ = 0; +#line 2031 "DataCollection.c" + DataSet* _tmp4_; + gint _tmp5_; #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = self->priv->dataset; #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2027,7 +2040,7 @@ static void data_collection_real_clear (DataCollection* self) { if (!(_tmp5_ > 0)) { #line 475 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2029 "DataCollection.c" +#line 2042 "DataCollection.c" } } #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2054,7 +2067,7 @@ static void data_collection_real_clear (DataCollection* self) { data_collection_internal_remove (self, _tmp11_); #line 469 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 2056 "DataCollection.c" +#line 2069 "DataCollection.c" } } #line 478 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2065,15 +2078,15 @@ static void data_collection_real_clear (DataCollection* self) { _tmp13_ = 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 2067 "DataCollection.c" +#line 2080 "DataCollection.c" { GeeArrayList* _object_list = NULL; - GeeArrayList* _tmp14_ = NULL; - GeeArrayList* _tmp15_ = NULL; + GeeArrayList* _tmp14_; + GeeArrayList* _tmp15_; gint _object_size = 0; - GeeArrayList* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; gint _object_index = 0; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp14_ = removed; @@ -2093,15 +2106,15 @@ static void data_collection_real_clear (DataCollection* self) { _object_index = -1; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2095 "DataCollection.c" - gint _tmp19_ = 0; - gint _tmp20_ = 0; - gint _tmp21_ = 0; +#line 2108 "DataCollection.c" + gint _tmp19_; + gint _tmp20_; + gint _tmp21_; DataObject* object = NULL; - GeeArrayList* _tmp22_ = NULL; - gint _tmp23_ = 0; - gpointer _tmp24_ = NULL; - DataObject* _tmp25_ = NULL; + GeeArrayList* _tmp22_; + gint _tmp23_; + gpointer _tmp24_; + DataObject* _tmp25_; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp19_ = _object_index; #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2114,7 +2127,7 @@ static void data_collection_real_clear (DataCollection* self) { if (!(_tmp20_ < _tmp21_)) { #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2116 "DataCollection.c" +#line 2129 "DataCollection.c" } #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp22_ = _object_list; @@ -2130,15 +2143,15 @@ static void data_collection_real_clear (DataCollection* self) { data_object_notify_membership_changed (_tmp25_, NULL); #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 2132 "DataCollection.c" +#line 2145 "DataCollection.c" } #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_list); -#line 2136 "DataCollection.c" +#line 2149 "DataCollection.c" } #line 462 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (removed); -#line 2140 "DataCollection.c" +#line 2153 "DataCollection.c" } @@ -2147,14 +2160,14 @@ void data_collection_clear (DataCollection* self) { 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 2149 "DataCollection.c" +#line 2162 "DataCollection.c" } static void data_collection_real_close (DataCollection* self) { #line 493 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_clear (self); -#line 2156 "DataCollection.c" +#line 2169 "DataCollection.c" } @@ -2163,31 +2176,31 @@ void data_collection_close (DataCollection* self) { 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 2165 "DataCollection.c" +#line 2178 "DataCollection.c" } static gpointer _alteration_ref0 (gpointer self) { #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return self ? alteration_ref (self) : NULL; -#line 2172 "DataCollection.c" +#line 2185 "DataCollection.c" } void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration) { - DataObject* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + DataObject* _tmp0_; + gboolean _tmp1_; gboolean resort_occurred = FALSE; - DataSet* _tmp2_ = NULL; - DataObject* _tmp3_ = NULL; - Alteration* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp24_ = FALSE; - DataObject* _tmp25_ = NULL; - Alteration* _tmp26_ = NULL; - GeeMap* _tmp27_ = NULL; - GeeMap* _tmp28_ = NULL; + DataSet* _tmp2_; + DataObject* _tmp3_; + Alteration* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + gboolean _tmp24_; + DataObject* _tmp25_; + Alteration* _tmp26_; + GeeMap* _tmp27_; + GeeMap* _tmp28_; #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" @@ -2214,31 +2227,31 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* _tmp6_ = data_collection_are_notifications_frozen (self); #line 503 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp6_) { -#line 2216 "DataCollection.c" - GeeHashMap* _tmp7_ = NULL; +#line 2229 "DataCollection.c" + GeeHashMap* _tmp7_; Alteration* current = NULL; - GeeHashMap* _tmp9_ = NULL; - DataObject* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - Alteration* _tmp12_ = NULL; - GeeHashMap* _tmp18_ = NULL; - DataObject* _tmp19_ = NULL; - Alteration* _tmp20_ = NULL; + GeeHashMap* _tmp9_; + DataObject* _tmp10_; + gpointer _tmp11_; + Alteration* _tmp12_; + GeeHashMap* _tmp18_; + DataObject* _tmp19_; + Alteration* _tmp20_; gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; + gboolean _tmp22_; #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp7_ = self->priv->frozen_items_altered; #line 504 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp7_ == NULL) { -#line 2232 "DataCollection.c" - GeeHashMap* _tmp8_ = NULL; +#line 2245 "DataCollection.c" + GeeHashMap* _tmp8_; #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); #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 2240 "DataCollection.c" +#line 2253 "DataCollection.c" } #line 509 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp9_ = self->priv->frozen_items_altered; @@ -2252,10 +2265,10 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* _tmp12_ = current; #line 510 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp12_ != NULL) { -#line 2254 "DataCollection.c" - Alteration* _tmp13_ = NULL; - Alteration* _tmp14_ = NULL; - Alteration* _tmp15_ = NULL; +#line 2267 "DataCollection.c" + Alteration* _tmp13_; + Alteration* _tmp14_; + Alteration* _tmp15_; #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp13_ = current; #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2266,10 +2279,10 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* _alteration_unref0 (current); #line 511 "/home/jens/Source/shotwell/src/core/DataCollection.vala" current = _tmp15_; -#line 2268 "DataCollection.c" +#line 2281 "DataCollection.c" } else { - Alteration* _tmp16_ = NULL; - Alteration* _tmp17_ = NULL; + Alteration* _tmp16_; + Alteration* _tmp17_; #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp16_ = alteration; #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2278,7 +2291,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* _alteration_unref0 (current); #line 513 "/home/jens/Source/shotwell/src/core/DataCollection.vala" current = _tmp17_; -#line 2280 "DataCollection.c" +#line 2293 "DataCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp18_ = self->priv->frozen_items_altered; @@ -2294,14 +2307,14 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* if (_tmp22_) { #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp21_ = TRUE; -#line 2296 "DataCollection.c" +#line 2309 "DataCollection.c" } else { - gboolean _tmp23_ = FALSE; + gboolean _tmp23_; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp23_ = resort_occurred; #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp21_ = _tmp23_; -#line 2303 "DataCollection.c" +#line 2316 "DataCollection.c" } #line 517 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->priv->fire_ordering_changed = _tmp21_; @@ -2309,7 +2322,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* _alteration_unref0 (current); #line 519 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2311 "DataCollection.c" +#line 2324 "DataCollection.c" } #line 522 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp24_ = resort_occurred; @@ -2317,7 +2330,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* if (_tmp24_) { #line 523 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_notify_ordering_changed (self); -#line 2319 "DataCollection.c" +#line 2332 "DataCollection.c" } #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp25_ = object; @@ -2331,15 +2344,15 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject* data_collection_notify_items_altered (self, _tmp28_); #line 525 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_tmp28_); -#line 2333 "DataCollection.c" +#line 2346 "DataCollection.c" } GValue* data_collection_get_property (DataCollection* self, const gchar* name) { GValue* result = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; #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" @@ -2354,7 +2367,7 @@ GValue* data_collection_get_property (DataCollection* self, const gchar* name) { result = (GValue*) _tmp2_; #line 529 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2356 "DataCollection.c" +#line 2369 "DataCollection.c" } @@ -2363,7 +2376,7 @@ static gboolean _bool_value_equals_value_equal_func (GValue* a, GValue* b, gpoin result = bool_value_equals (a, b); #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2365 "DataCollection.c" +#line 2378 "DataCollection.c" } @@ -2372,27 +2385,27 @@ static gboolean _int_value_equals_value_equal_func (GValue* a, GValue* b, gpoint result = int_value_equals (a, b); #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2374 "DataCollection.c" +#line 2387 "DataCollection.c" } void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) { - ValueEqualFunc _tmp0_ = NULL; - void* _tmp0__target = NULL; + ValueEqualFunc _tmp0_; + void* _tmp0__target; GValue* old = NULL; - GeeHashMap* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GValue* _tmp6_ = NULL; - GeeHashMap* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GValue _tmp14_ = {0}; - const gchar* _tmp15_ = NULL; - GValue* _tmp16_ = NULL; - GValue _tmp17_ = {0}; + GeeHashMap* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; + GValue* _tmp6_; + GeeHashMap* _tmp12_; + const gchar* _tmp13_; + GValue _tmp14_; + const gchar* _tmp15_; + GValue* _tmp16_; + GValue _tmp17_; gint count = 0; - DataSet* _tmp18_ = NULL; - gint _tmp19_ = 0; + DataSet* _tmp18_; + gint _tmp19_; #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" @@ -2405,8 +2418,8 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal _tmp0__target = value_equals_target; #line 533 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp0_ == NULL) { -#line 2407 "DataCollection.c" - gboolean _tmp1_ = FALSE; +#line 2420 "DataCollection.c" + gboolean _tmp1_; #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" @@ -2415,9 +2428,9 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal value_equals = _bool_value_equals_value_equal_func; #line 535 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals_target = NULL; -#line 2417 "DataCollection.c" +#line 2430 "DataCollection.c" } else { - gboolean _tmp2_ = FALSE; + 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" @@ -2426,11 +2439,11 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal value_equals = _int_value_equals_value_equal_func; #line 537 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value_equals_target = NULL; -#line 2428 "DataCollection.c" +#line 2441 "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 2432 "DataCollection.c" +#line 2445 "DataCollection.c" } } } @@ -2446,13 +2459,13 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal _tmp6_ = old; #line 543 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp6_ != NULL) { -#line 2448 "DataCollection.c" - ValueEqualFunc _tmp7_ = NULL; - void* _tmp7__target = NULL; - GValue* _tmp8_ = NULL; - GValue _tmp9_ = {0}; - GValue _tmp10_ = {0}; - gboolean _tmp11_ = FALSE; +#line 2461 "DataCollection.c" + ValueEqualFunc _tmp7_; + void* _tmp7__target; + GValue* _tmp8_; + GValue _tmp9_; + GValue _tmp10_; + gboolean _tmp11_; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp7_ = value_equals; #line 544 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2471,7 +2484,7 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal __vala_GValue_free0 (old); #line 545 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2473 "DataCollection.c" +#line 2486 "DataCollection.c" } } #line 548 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2496,37 +2509,37 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal _tmp19_ = data_set_get_count (_tmp18_); #line 553 "/home/jens/Source/shotwell/src/core/DataCollection.vala" count = _tmp19_; -#line 2498 "DataCollection.c" +#line 2511 "DataCollection.c" { gint ctr = 0; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 2503 "DataCollection.c" +#line 2516 "DataCollection.c" { gboolean _tmp20_ = FALSE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp20_ = TRUE; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2510 "DataCollection.c" - gint _tmp22_ = 0; - gint _tmp23_ = 0; - DataSet* _tmp24_ = NULL; - gint _tmp25_ = 0; - DataObject* _tmp26_ = NULL; - DataObject* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - GValue* _tmp29_ = NULL; - GValue _tmp30_ = {0}; +#line 2523 "DataCollection.c" + gint _tmp22_; + gint _tmp23_; + DataSet* _tmp24_; + gint _tmp25_; + DataObject* _tmp26_; + DataObject* _tmp27_; + const gchar* _tmp28_; + GValue* _tmp29_; + GValue _tmp30_; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!_tmp20_) { -#line 2522 "DataCollection.c" - gint _tmp21_ = 0; +#line 2535 "DataCollection.c" + gint _tmp21_; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp21_ = ctr; #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = _tmp21_ + 1; -#line 2528 "DataCollection.c" +#line 2541 "DataCollection.c" } #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp20_ = FALSE; @@ -2538,7 +2551,7 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal if (!(_tmp22_ < _tmp23_)) { #line 554 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2540 "DataCollection.c" +#line 2553 "DataCollection.c" } #line 555 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp24_ = self->priv->dataset; @@ -2558,24 +2571,24 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal 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 2560 "DataCollection.c" +#line 2573 "DataCollection.c" } } } #line 532 "/home/jens/Source/shotwell/src/core/DataCollection.vala" __vala_GValue_free0 (old); -#line 2566 "DataCollection.c" +#line 2579 "DataCollection.c" } void data_collection_clear_property (DataCollection* self, const gchar* name) { - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; + const gchar* _tmp3_; gint count = 0; - DataSet* _tmp4_ = NULL; - gint _tmp5_ = 0; + DataSet* _tmp4_; + gint _tmp5_; #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" @@ -2590,7 +2603,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) { if (!_tmp2_) { #line 560 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2592 "DataCollection.c" +#line 2605 "DataCollection.c" } #line 563 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp3_ = name; @@ -2602,35 +2615,35 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) { _tmp5_ = data_set_get_count (_tmp4_); #line 566 "/home/jens/Source/shotwell/src/core/DataCollection.vala" count = _tmp5_; -#line 2604 "DataCollection.c" +#line 2617 "DataCollection.c" { gint ctr = 0; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = 0; -#line 2609 "DataCollection.c" +#line 2622 "DataCollection.c" { gboolean _tmp6_ = FALSE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp6_ = TRUE; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 2616 "DataCollection.c" - gint _tmp8_ = 0; - gint _tmp9_ = 0; - DataSet* _tmp10_ = NULL; - gint _tmp11_ = 0; - DataObject* _tmp12_ = NULL; - DataObject* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; +#line 2629 "DataCollection.c" + gint _tmp8_; + gint _tmp9_; + DataSet* _tmp10_; + gint _tmp11_; + DataObject* _tmp12_; + DataObject* _tmp13_; + const gchar* _tmp14_; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (!_tmp6_) { -#line 2626 "DataCollection.c" - gint _tmp7_ = 0; +#line 2639 "DataCollection.c" + gint _tmp7_; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp7_ = ctr; #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ctr = _tmp7_ + 1; -#line 2632 "DataCollection.c" +#line 2645 "DataCollection.c" } #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp6_ = FALSE; @@ -2642,7 +2655,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) { if (!(_tmp8_ < _tmp9_)) { #line 567 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 2644 "DataCollection.c" +#line 2657 "DataCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp10_ = self->priv->dataset; @@ -2658,7 +2671,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) { data_object_notify_collection_property_cleared (_tmp13_, _tmp14_); #line 568 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_tmp13_); -#line 2660 "DataCollection.c" +#line 2673 "DataCollection.c" } } } @@ -2666,7 +2679,7 @@ void data_collection_clear_property (DataCollection* self, const gchar* name) { void data_collection_freeze_notifications (DataCollection* self) { - gint _tmp0_ = 0; + gint _tmp0_; #line 581 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 582 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2677,15 +2690,15 @@ 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 2679 "DataCollection.c" +#line 2692 "DataCollection.c" } } void data_collection_thaw_notifications (DataCollection* self) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 586 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (IS_DATA_COLLECTION (self)); #line 587 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2694,7 +2707,7 @@ void data_collection_thaw_notifications (DataCollection* self) { if (_tmp0_ == 0) { #line 588 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return; -#line 2696 "DataCollection.c" +#line 2709 "DataCollection.c" } #line 590 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp1_ = self->priv->notifies_frozen; @@ -2706,14 +2719,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 2708 "DataCollection.c" +#line 2721 "DataCollection.c" } } gboolean data_collection_are_notifications_frozen (DataCollection* self) { gboolean result = FALSE; - gint _tmp0_ = 0; + gint _tmp0_; #line 594 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_val_if_fail (IS_DATA_COLLECTION (self), FALSE); #line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2722,14 +2735,14 @@ gboolean data_collection_are_notifications_frozen (DataCollection* self) { result = _tmp0_ > 0; #line 595 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 2724 "DataCollection.c" +#line 2737 "DataCollection.c" } static void data_collection_real_notify_frozen (DataCollection* self) { #line 601 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit_by_name (self, "frozen"); -#line 2731 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_FROZEN_SIGNAL], 0); +#line 2744 "DataCollection.c" } @@ -2738,22 +2751,22 @@ void data_collection_notify_frozen (DataCollection* self) { 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 2740 "DataCollection.c" +#line 2753 "DataCollection.c" } static void data_collection_real_notify_thawed (DataCollection* self) { - GeeHashMap* _tmp0_ = NULL; - gboolean _tmp4_ = FALSE; + 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 2751 "DataCollection.c" +#line 2764 "DataCollection.c" GeeMap* copy = NULL; - GeeHashMap* _tmp1_ = NULL; - GeeMap* _tmp2_ = NULL; - GeeMap* _tmp3_ = NULL; + GeeHashMap* _tmp1_; + GeeMap* _tmp2_; + GeeMap* _tmp3_; #line 609 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp1_ = self->priv->frozen_items_altered; #line 609 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -2770,7 +2783,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 2772 "DataCollection.c" +#line 2785 "DataCollection.c" } #line 615 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = self->priv->fire_ordering_changed; @@ -2780,11 +2793,11 @@ 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 2782 "DataCollection.c" +#line 2795 "DataCollection.c" } #line 620 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_emit_by_name (self, "thawed"); -#line 2786 "DataCollection.c" + g_signal_emit (self, data_collection_signals[DATA_COLLECTION_THAWED_SIGNAL], 0); +#line 2799 "DataCollection.c" } @@ -2793,21 +2806,21 @@ void data_collection_notify_thawed (DataCollection* self) { 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 2795 "DataCollection.c" +#line 2808 "DataCollection.c" } 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 2802 "DataCollection.c" +#line 2815 "DataCollection.c" } 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 2809 "DataCollection.c" +#line 2822 "DataCollection.c" } @@ -2816,7 +2829,7 @@ static void data_collection_real_contents_altered (DataCollection* self, GeeIter 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 2818 "DataCollection.c" +#line 2831 "DataCollection.c" } @@ -2835,26 +2848,26 @@ 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 2837 "DataCollection.c" +#line 2850 "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 2843 "DataCollection.c" +#line 2856 "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 2849 "DataCollection.c" +#line 2862 "DataCollection.c" } 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 2856 "DataCollection.c" +#line 2869 "DataCollection.c" } @@ -2867,13 +2880,13 @@ static void data_collection_real_property_set (DataCollection* self, const gchar g_return_if_fail (name != NULL); #line 140 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (val != NULL); -#line 2869 "DataCollection.c" +#line 2882 "DataCollection.c" } -static void g_cclosure_user_marshal_VOID__STRING_BOXED_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_BOXED_BOXED) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); - register GMarshalFunc_VOID__STRING_BOXED_BOXED callback; +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; register gpointer data1; register gpointer data2; @@ -2886,26 +2899,26 @@ static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data2 = param_values->data[0].v_pointer; -#line 2888 "DataCollection.c" +#line 2901 "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 2894 "DataCollection.c" +#line 2907 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED) (marshal_data ? marshal_data : cc->callback); + 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 2900 "DataCollection.c" +#line 2913 "DataCollection.c" } 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 2907 "DataCollection.c" +#line 2920 "DataCollection.c" } @@ -2920,22 +2933,22 @@ 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) { #line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala" data_collection_marker_impl_on_items_removed ((DataCollectionMarkerImpl*) self, removed); -#line 2922 "DataCollection.c" +#line 2935 "DataCollection.c" } 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 2929 "DataCollection.c" +#line 2942 "DataCollection.c" } static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType object_type, DataCollection* owner) { DataCollectionMarkerImpl * self = NULL; - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; - DataCollection* _tmp2_ = 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" @@ -2954,24 +2967,24 @@ static DataCollectionMarkerImpl* data_collection_marker_impl_construct (GType ob g_signal_connect_object (_tmp2_, "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 2956 "DataCollection.c" +#line 2969 "DataCollection.c" } 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 2963 "DataCollection.c" +#line 2976 "DataCollection.c" } static void data_collection_marker_impl_real_mark (Marker* base, DataObject* object) { DataCollectionMarkerImpl * self; - DataCollection* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp3_ = NULL; - DataObject* _tmp4_ = NULL; + DataCollection* _tmp0_; + DataObject* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp3_; + DataObject* _tmp4_; #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" @@ -2990,17 +3003,17 @@ static void data_collection_marker_impl_real_mark (Marker* base, DataObject* obj _tmp4_ = object; #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 2992 "DataCollection.c" +#line 3005 "DataCollection.c" } static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* object) { DataCollectionMarkerImpl * self; - DataCollection* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp3_ = NULL; - DataObject* _tmp4_ = NULL; + DataCollection* _tmp0_; + DataObject* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp3_; + DataObject* _tmp4_; #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" @@ -3019,22 +3032,22 @@ static void data_collection_marker_impl_real_unmark (Marker* base, DataObject* o _tmp4_ = object; #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 3021 "DataCollection.c" +#line 3034 "DataCollection.c" } static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObject* object) { DataCollectionMarkerImpl * self; gboolean result = FALSE; - DataCollection* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp3_ = NULL; - DataObject* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - GeeHashSet* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + DataCollection* _tmp0_; + DataObject* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp3_; + DataObject* _tmp4_; + gboolean _tmp5_; + GeeHashSet* _tmp10_; + DataObject* _tmp11_; + gboolean _tmp12_; #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,26 +3068,26 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec _tmp5_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); #line 42 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp5_) { -#line 3057 "DataCollection.c" - GeeHashSet* _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; +#line 3070 "DataCollection.c" + GeeHashSet* _tmp6_; + DataObject* _tmp7_; #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp6_ = self->marked; #line 43 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp7_ = object; #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 3066 "DataCollection.c" +#line 3079 "DataCollection.c" } else { - GeeHashSet* _tmp8_ = NULL; - DataObject* _tmp9_ = NULL; + GeeHashSet* _tmp8_; + DataObject* _tmp9_; #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp8_ = self->marked; #line 45 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp9_ = object; #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 3076 "DataCollection.c" +#line 3089 "DataCollection.c" } #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp10_ = self->marked; @@ -3086,7 +3099,7 @@ static gboolean data_collection_marker_impl_real_toggle (Marker* base, DataObjec result = _tmp12_; #line 48 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return result; -#line 3088 "DataCollection.c" +#line 3101 "DataCollection.c" } @@ -3096,11 +3109,11 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect 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 3098 "DataCollection.c" +#line 3111 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = list; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3109,17 +3122,17 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect _object_it = _tmp1_; #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3111 "DataCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 3124 "DataCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - DataCollection* _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - GeeHashSet* _tmp9_ = NULL; - DataObject* _tmp10_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataCollection* _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" @@ -3128,7 +3141,7 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect if (!_tmp3_) { #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3130 "DataCollection.c" +#line 3143 "DataCollection.c" } #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = _object_it; @@ -3152,11 +3165,11 @@ static void data_collection_marker_impl_real_mark_many (Marker* base, GeeCollect gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3154 "DataCollection.c" +#line 3167 "DataCollection.c" } #line 52 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3158 "DataCollection.c" +#line 3171 "DataCollection.c" } } @@ -3167,11 +3180,11 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle 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 3169 "DataCollection.c" +#line 3182 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = list; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3180,17 +3193,17 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle _object_it = _tmp1_; #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3182 "DataCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 3195 "DataCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - DataCollection* _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - GeeHashSet* _tmp9_ = NULL; - DataObject* _tmp10_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataCollection* _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" @@ -3199,7 +3212,7 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle if (!_tmp3_) { #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3201 "DataCollection.c" +#line 3214 "DataCollection.c" } #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = _object_it; @@ -3223,11 +3236,11 @@ static void data_collection_marker_impl_real_unmark_many (Marker* base, GeeColle gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3225 "DataCollection.c" +#line 3238 "DataCollection.c" } #line 60 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3229 "DataCollection.c" +#line 3242 "DataCollection.c" } } @@ -3236,14 +3249,14 @@ 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 3238 "DataCollection.c" +#line 3251 "DataCollection.c" { GeeIterator* _object_it = NULL; - DataCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + DataCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; + GeeIterator* _tmp4_; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->owner; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3260,14 +3273,14 @@ 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 3262 "DataCollection.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 3275 "DataCollection.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - GeeHashSet* _tmp9_ = NULL; - DataObject* _tmp10_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeHashSet* _tmp9_; + DataObject* _tmp10_; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp5_ = _object_it; #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3276,7 +3289,7 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) { if (!_tmp6_) { #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3278 "DataCollection.c" +#line 3291 "DataCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp7_ = _object_it; @@ -3292,11 +3305,11 @@ static void data_collection_marker_impl_real_mark_all (Marker* base) { gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3294 "DataCollection.c" +#line 3307 "DataCollection.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3298 "DataCollection.c" +#line 3311 "DataCollection.c" } } @@ -3305,17 +3318,17 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) { DataCollectionMarkerImpl * self; gint result = 0; gint _tmp0_ = 0; - GeeHashSet* _tmp1_ = NULL; + GeeHashSet* _tmp1_; #line 72 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp1_ = self->marked; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp1_ != NULL) { -#line 3314 "DataCollection.c" - GeeHashSet* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; +#line 3327 "DataCollection.c" + GeeHashSet* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp2_ = self->marked; #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3324,20 +3337,20 @@ 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 3326 "DataCollection.c" +#line 3339 "DataCollection.c" } else { - gint _tmp5_ = 0; + 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 3333 "DataCollection.c" +#line 3346 "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 3339 "DataCollection.c" +#line 3352 "DataCollection.c" } @@ -3345,8 +3358,8 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) { DataCollectionMarkerImpl * self; GeeCollection* result = NULL; GeeArrayList* copy = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + GeeHashSet* _tmp1_; #line 76 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 77 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3361,7 +3374,7 @@ 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 3363 "DataCollection.c" +#line 3376 "DataCollection.c" } @@ -3370,11 +3383,11 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm 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 3372 "DataCollection.c" +#line 3385 "DataCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = removed; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3383,14 +3396,14 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm _object_it = _tmp1_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" while (TRUE) { -#line 3385 "DataCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 3398 "DataCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + GeeHashSet* _tmp6_; + DataObject* _tmp7_; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp2_ = _object_it; #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3399,7 +3412,7 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm if (!_tmp3_) { #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" break; -#line 3401 "DataCollection.c" +#line 3414 "DataCollection.c" } #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp4_ = _object_it; @@ -3415,18 +3428,18 @@ static void data_collection_marker_impl_on_items_removed (DataCollectionMarkerIm gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_); #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (object); -#line 3417 "DataCollection.c" +#line 3430 "DataCollection.c" } #line 84 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _g_object_unref0 (_object_it); -#line 3421 "DataCollection.c" +#line 3434 "DataCollection.c" } } static void data_collection_marker_impl_freeze (DataCollectionMarkerImpl* self) { - DataCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; + DataCollection* _tmp0_; + guint _tmp1_; #line 91 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self)); #line 92 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3435,22 +3448,22 @@ 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 3437 "DataCollection.c" +#line 3450 "DataCollection.c" } static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self) { - GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp0_; #line 95 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_return_if_fail (DATA_COLLECTION_IS_MARKER_IMPL (self)); #line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = self->marked; #line 96 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp0_ != NULL) { -#line 3449 "DataCollection.c" - GeeHashSet* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; +#line 3462 "DataCollection.c" + GeeHashSet* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp1_ = self->marked; #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3459,21 +3472,21 @@ 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 3461 "DataCollection.c" +#line 3474 "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 3467 "DataCollection.c" +#line 3480 "DataCollection.c" } static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* self, DataCollection* collection) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - DataCollection* _tmp1_ = NULL; - DataCollection* _tmp2_ = NULL; + 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" @@ -3484,23 +3497,23 @@ static gboolean data_collection_marker_impl_is_valid (DataCollectionMarkerImpl* _tmp2_ = self->owner; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (_tmp1_ == _tmp2_) { -#line 3486 "DataCollection.c" - GeeHashSet* _tmp3_ = NULL; +#line 3499 "DataCollection.c" + GeeHashSet* _tmp3_; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp3_ = self->marked; #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = _tmp3_ != NULL; -#line 3492 "DataCollection.c" +#line 3505 "DataCollection.c" } else { #line 103 "/home/jens/Source/shotwell/src/core/DataCollection.vala" _tmp0_ = FALSE; -#line 3496 "DataCollection.c" +#line 3509 "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 3502 "DataCollection.c" +#line 3515 "DataCollection.c" } @@ -3509,7 +3522,7 @@ static void data_collection_marker_impl_class_init (DataCollectionMarkerImplClas 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 3511 "DataCollection.c" +#line 3524 "DataCollection.c" } @@ -3517,41 +3530,41 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa #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" - iface->mark = (void (*)(Marker*, DataObject*)) data_collection_marker_impl_real_mark; + iface->mark = (void (*) (Marker *, DataObject*)) data_collection_marker_impl_real_mark; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - iface->unmark = (void (*)(Marker*, DataObject*)) data_collection_marker_impl_real_unmark; + iface->unmark = (void (*) (Marker *, DataObject*)) data_collection_marker_impl_real_unmark; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - iface->toggle = (gboolean (*)(Marker*, DataObject*)) data_collection_marker_impl_real_toggle; + iface->toggle = (gboolean (*) (Marker *, DataObject*)) data_collection_marker_impl_real_toggle; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - iface->mark_many = (void (*)(Marker*, GeeCollection*)) data_collection_marker_impl_real_mark_many; + iface->mark_many = (void (*) (Marker *, GeeCollection*)) data_collection_marker_impl_real_mark_many; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - iface->unmark_many = (void (*)(Marker*, GeeCollection*)) data_collection_marker_impl_real_unmark_many; + iface->unmark_many = (void (*) (Marker *, GeeCollection*)) data_collection_marker_impl_real_unmark_many; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - iface->mark_all = (void (*)(Marker*)) data_collection_marker_impl_real_mark_all; + iface->mark_all = (void (*) (Marker *)) data_collection_marker_impl_real_mark_all; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - iface->get_count = (gint (*)(Marker*)) data_collection_marker_impl_real_get_count; + 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 3534 "DataCollection.c" + iface->get_all = (GeeCollection* (*) (Marker *)) data_collection_marker_impl_real_get_all; +#line 3547 "DataCollection.c" } static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) { - GeeHashSet* _tmp0_ = NULL; + 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); #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->marked = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->freeze_count = 0; -#line 3546 "DataCollection.c" +#line 3559 "DataCollection.c" } -static void data_collection_marker_impl_finalize (GObject* obj) { +static void data_collection_marker_impl_finalize (GObject * obj) { DataCollectionMarkerImpl * self; - DataCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; + DataCollection* _tmp0_; + guint _tmp1_; #line 10 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl); #line 24 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3566,7 +3579,7 @@ 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 3568 "DataCollection.c" +#line 3581 "DataCollection.c" } @@ -3587,7 +3600,7 @@ static GType data_collection_marker_impl_get_type (void) { 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 3589 "DataCollection.c" +#line 3602 "DataCollection.c" } @@ -3596,7 +3609,7 @@ static void value_data_collection_free_value (GValue* value) { 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 3598 "DataCollection.c" +#line 3611 "DataCollection.c" } } @@ -3606,11 +3619,11 @@ static void value_data_collection_copy_value (const GValue* src_value, GValue* d 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 3608 "DataCollection.c" +#line 3621 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 3612 "DataCollection.c" +#line 3625 "DataCollection.c" } } @@ -3618,66 +3631,66 @@ static void value_data_collection_copy_value (const GValue* src_value, GValue* d 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 3620 "DataCollection.c" +#line 3633 "DataCollection.c" } 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 3627 "DataCollection.c" - DataCollection* object; +#line 3640 "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 3634 "DataCollection.c" +#line 3647 "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 3638 "DataCollection.c" +#line 3651 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = data_collection_ref (object); -#line 3642 "DataCollection.c" +#line 3655 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3646 "DataCollection.c" +#line 3659 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return NULL; -#line 3650 "DataCollection.c" +#line 3663 "DataCollection.c" } static gchar* value_data_collection_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - DataCollection** object_p; + 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 3661 "DataCollection.c" +#line 3674 "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 3667 "DataCollection.c" +#line 3680 "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 3671 "DataCollection.c" +#line 3684 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" *object_p = data_collection_ref (value->data[0].v_pointer); -#line 3675 "DataCollection.c" +#line 3688 "DataCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" return NULL; -#line 3679 "DataCollection.c" +#line 3692 "DataCollection.c" } @@ -3691,7 +3704,7 @@ 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 3693 "DataCollection.c" +#line 3706 "DataCollection.c" } @@ -3700,12 +3713,12 @@ gpointer value_get_data_collection (const GValue* value) { 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 3702 "DataCollection.c" +#line 3715 "DataCollection.c" } void value_set_data_collection (GValue* value, gpointer v_object) { - DataCollection* old; + 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)); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3720,23 +3733,23 @@ 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 3722 "DataCollection.c" +#line 3735 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3726 "DataCollection.c" +#line 3739 "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 3732 "DataCollection.c" +#line 3745 "DataCollection.c" } } void value_take_data_collection (GValue* value, gpointer v_object) { - DataCollection* old; + 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)); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3749,17 +3762,17 @@ 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 3751 "DataCollection.c" +#line 3764 "DataCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" value->data[0].v_pointer = NULL; -#line 3755 "DataCollection.c" +#line 3768 "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 3761 "DataCollection.c" +#line 3774 "DataCollection.c" } } @@ -3772,51 +3785,51 @@ static void data_collection_class_init (DataCollectionClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" g_type_class_add_private (klass, sizeof (DataCollectionPrivate)); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->to_string = (gchar* (*)(DataCollection*)) data_collection_real_to_string; + ((DataCollectionClass *) klass)->to_string = (gchar* (*) (DataCollection *)) data_collection_real_to_string; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_added; + ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) data_collection_real_notify_items_added; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_removed; + ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) data_collection_real_notify_items_removed; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered; + ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) data_collection_real_notify_items_altered; + ((DataCollectionClass *) klass)->notify_items_altered = (void (*) (DataCollection *, GeeMap*)) data_collection_real_notify_items_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_ordering_changed = (void (*)(DataCollection*)) data_collection_real_notify_ordering_changed; + ((DataCollectionClass *) klass)->notify_ordering_changed = (void (*) (DataCollection *)) data_collection_real_notify_ordering_changed; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_property_set = (void (*)(DataCollection*, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set; + ((DataCollectionClass *) klass)->notify_property_set = (void (*) (DataCollection *, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_property_cleared = (void (*)(DataCollection*, const gchar*)) data_collection_real_notify_property_cleared; + ((DataCollectionClass *) klass)->notify_property_cleared = (void (*) (DataCollection *, const gchar*)) data_collection_real_notify_property_cleared; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_valid_type; + ((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_valid_type; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator; + ((DataCollectionClass *) klass)->set_comparator = (void (*) (DataCollection *, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) data_collection_real_reset_comparator; + ((DataCollectionClass *) klass)->reset_comparator = (void (*) (DataCollection *)) data_collection_real_reset_comparator; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) data_collection_real_get_all; + ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*) (DataCollection *)) data_collection_real_get_all; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) data_collection_real_get_count; + ((DataCollectionClass *) klass)->get_count = (gint (*) (DataCollection *)) data_collection_real_get_count; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) data_collection_real_get_at; + ((DataCollectionClass *) klass)->get_at = (DataObject* (*) (DataCollection *, gint)) data_collection_real_get_at; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) data_collection_real_index_of; + ((DataCollectionClass *) klass)->index_of = (gint (*) (DataCollection *, DataObject*)) data_collection_real_index_of; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_contains; + ((DataCollectionClass *) klass)->contains = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_contains; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_add; + ((DataCollectionClass *) klass)->add = (gboolean (*) (DataCollection *, DataObject*)) data_collection_real_add; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many; + ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*) (DataCollection *, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->remove_marked = (void (*)(DataCollection*, Marker*)) data_collection_real_remove_marked; + ((DataCollectionClass *) klass)->remove_marked = (void (*) (DataCollection *, Marker*)) data_collection_real_remove_marked; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) data_collection_real_clear; + ((DataCollectionClass *) klass)->clear = (void (*) (DataCollection *)) data_collection_real_clear; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) data_collection_real_close; + ((DataCollectionClass *) klass)->close = (void (*) (DataCollection *)) data_collection_real_close; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_frozen = (void (*)(DataCollection*)) data_collection_real_notify_frozen; + ((DataCollectionClass *) klass)->notify_frozen = (void (*) (DataCollection *)) data_collection_real_notify_frozen; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - ((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) data_collection_real_notify_thawed; + ((DataCollectionClass *) klass)->notify_thawed = (void (*) (DataCollection *)) data_collection_real_notify_thawed; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ((DataCollectionClass *) klass)->items_added = data_collection_real_items_added; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3836,30 +3849,30 @@ static void data_collection_class_init (DataCollectionClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" ((DataCollectionClass *) klass)->thawed = data_collection_real_thawed; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_new ("items_added", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); + data_collection_signals[DATA_COLLECTION_ITEMS_ADDED_SIGNAL] = g_signal_new ("items-added", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_new ("items_removed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); + data_collection_signals[DATA_COLLECTION_ITEMS_REMOVED_SIGNAL] = g_signal_new ("items-removed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_new ("contents_altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_ITERABLE, GEE_TYPE_ITERABLE); + data_collection_signals[DATA_COLLECTION_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_ITERABLE, GEE_TYPE_ITERABLE); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_new ("items_altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_MAP); + data_collection_signals[DATA_COLLECTION_ITEMS_ALTERED_SIGNAL] = g_signal_new ("items-altered", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, items_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_MAP); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_new ("ordering_changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + data_collection_signals[DATA_COLLECTION_ORDERING_CHANGED_SIGNAL] = g_signal_new ("ordering-changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_new ("property_set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE); + data_collection_signals[DATA_COLLECTION_PROPERTY_SET_SIGNAL] = g_signal_new ("property-set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_POINTER_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - g_signal_new ("property_cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + data_collection_signals[DATA_COLLECTION_PROPERTY_CLEARED_SIGNAL] = g_signal_new ("property-cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" - 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); + 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" - 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 3855 "DataCollection.c" + 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" } static void data_collection_instance_init (DataCollection * self) { - DataSet* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; + DataSet* _tmp0_; + GeeHashMap* _tmp1_; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" self->priv = DATA_COLLECTION_GET_PRIVATE (self); #line 108 "/home/jens/Source/shotwell/src/core/DataCollection.vala" @@ -3880,11 +3893,11 @@ 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 3882 "DataCollection.c" +#line 3895 "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); @@ -3898,7 +3911,7 @@ 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 3900 "DataCollection.c" +#line 3913 "DataCollection.c" } @@ -3917,18 +3930,18 @@ GType data_collection_get_type (void) { gpointer data_collection_ref (gpointer instance) { - DataCollection* self; + 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 3925 "DataCollection.c" +#line 3938 "DataCollection.c" } void data_collection_unref (gpointer instance) { - DataCollection* self; + DataCollection * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3936,7 +3949,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 3938 "DataCollection.c" +#line 3951 "DataCollection.c" } } diff --git a/src/core/DataObject.c b/src/core/DataObject.c index 58505c6..a34dc93 100644 --- a/src/core/DataObject.c +++ b/src/core/DataObject.c @@ -1,4 +1,4 @@ -/* DataObject.c generated by valac 0.34.7, the Vala compiler +/* DataObject.c generated by valac 0.36.6, the Vala compiler * generated from DataObject.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -139,13 +139,13 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G 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); +static void data_object_finalize (GObject * obj); DataObject* data_object_construct (GType object_type, gint64 object_id) { DataObject * self = NULL; gint64 _tmp0_ = 0LL; - gint64 _tmp1_ = 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" @@ -153,7 +153,7 @@ DataObject* data_object_construct (GType object_type, gint64 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_ = 0LL; + gint64 _tmp2_; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp2_ = data_object_object_id_generator; #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -162,7 +162,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) { _tmp0_ = _tmp2_; #line 164 "DataObject.c" } else { - gint64 _tmp3_ = 0LL; + 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" @@ -178,7 +178,7 @@ DataObject* data_object_construct (GType object_type, gint64 object_id) { static void data_object_real_notify_altered (DataObject* self, Alteration* alteration) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_ALTERATION (alteration)); #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -186,8 +186,8 @@ static void data_object_real_notify_altered (DataObject* self, Alteration* alter #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { #line 189 "DataObject.c" - DataCollection* _tmp1_ = NULL; - Alteration* _tmp2_ = NULL; + 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" @@ -303,8 +303,8 @@ static gpointer _data_collection_ref0 (gpointer self) { DataCollection* data_object_get_membership (DataObject* self) { DataCollection* result = NULL; - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; + DataCollection* _tmp0_; + DataCollection* _tmp1_; #line 73 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), NULL); #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -321,7 +321,7 @@ DataCollection* data_object_get_membership (DataObject* self) { gboolean data_object_has_membership (DataObject* self) { gboolean result = FALSE; - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 77 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), FALSE); #line 78 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -335,10 +335,10 @@ gboolean data_object_has_membership (DataObject* self) { void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal) { - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; - DataCollection* _tmp2_ = NULL; - gint64 _tmp3_ = 0LL; + 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" @@ -364,8 +364,8 @@ void data_object_internal_set_membership (DataObject* self, DataCollection* coll void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) { - DataCollection* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; + 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" @@ -395,7 +395,7 @@ void data_object_internal_clear_membership (DataObject* self) { inline gint64 data_object_internal_get_ordinal (DataObject* self) { gint64 result = 0LL; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 110 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), 0LL); #line 111 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -410,7 +410,7 @@ inline gint64 data_object_internal_get_ordinal (DataObject* self) { inline gint64 data_object_get_object_id (DataObject* self) { gint64 result = 0LL; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 114 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_val_if_fail (IS_DATA_OBJECT (self), 0LL); #line 115 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -433,13 +433,13 @@ static void _vala_GValue_free (GValue* self) { void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; GValue* _result_ = NULL; - DataCollection* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GValue* _tmp5_ = NULL; + DataCollection* _tmp3_; + const gchar* _tmp4_; + GValue* _tmp5_; GValue* _tmp6_ = NULL; - GValue* _tmp7_ = NULL; + GValue* _tmp7_; GValue _tmp10_ = {0}; #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); @@ -450,7 +450,7 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G #line 119 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ == NULL) { #line 453 "DataObject.c" - GValue* _tmp1_ = NULL; + GValue* _tmp1_; GValue _tmp2_ = {0}; #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp1_ = def; @@ -485,14 +485,14 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp7_ != NULL) { #line 488 "DataObject.c" - GValue* _tmp8_ = NULL; + GValue* _tmp8_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp8_ = _result_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp6_ = _tmp8_; #line 494 "DataObject.c" } else { - GValue* _tmp9_ = NULL; + GValue* _tmp9_; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" _tmp9_ = def; #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -522,7 +522,7 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -534,11 +534,11 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G #line 128 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { #line 537 "DataObject.c" - DataCollection* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GValue _tmp3_ = {0}; - ValueEqualFunc _tmp4_ = NULL; - void* _tmp4__target = NULL; + DataCollection* _tmp1_; + const gchar* _tmp2_; + GValue _tmp3_; + ValueEqualFunc _tmp4_; + void* _tmp4__target; #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" @@ -557,7 +557,7 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G void data_object_clear_collection_property (DataObject* self, const gchar* name) { - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_return_if_fail (IS_DATA_OBJECT (self)); #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala" @@ -567,8 +567,8 @@ void data_object_clear_collection_property (DataObject* self, const gchar* name) #line 133 "/home/jens/Source/shotwell/src/core/DataObject.vala" if (_tmp0_ != NULL) { #line 570 "DataObject.c" - DataCollection* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + 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" @@ -586,17 +586,17 @@ static void data_object_class_init (DataObjectClass * klass) { #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" g_type_class_add_private (klass, sizeof (DataObjectPrivate)); #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_object_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) data_object_real_notify_altered; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_object_real_notify_membership_changed; + ((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) data_object_real_notify_membership_changed; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) data_object_real_notify_collection_property_set; + ((DataObjectClass *) klass)->notify_collection_property_set = (void (*) (DataObject *, const gchar*, GValue*, GValue*)) data_object_real_notify_collection_property_set; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->notify_collection_property_cleared = (void (*)(DataObject*, const gchar*)) data_object_real_notify_collection_property_cleared; + ((DataObjectClass *) klass)->notify_collection_property_cleared = (void (*) (DataObject *, const gchar*)) data_object_real_notify_collection_property_cleared; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_object_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) data_object_real_get_name; #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala" - ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_object_real_to_string; + ((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" @@ -616,7 +616,7 @@ static void data_object_instance_init (DataObject * self) { } -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); diff --git a/src/core/DataSet.c b/src/core/DataSet.c index a6ea6b0..cc12b64 100644 --- a/src/core/DataSet.c +++ b/src/core/DataSet.c @@ -1,4 +1,4 @@ -/* DataSet.c generated by valac 0.34.7, the Vala compiler +/* DataSet.c generated by valac 0.36.6, the Vala compiler * generated from DataSet.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -162,7 +162,7 @@ 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); +static void data_set_finalize (DataSet * obj); DataSet* data_set_construct (GType object_type) { @@ -186,10 +186,10 @@ DataSet* data_set_new (void) { static gint64 data_set_order_added_comparator (DataSet* self, void* a, void* b) { gint64 result = 0LL; - void* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - void* _tmp2_ = NULL; - gint64 _tmp3_ = 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" @@ -226,13 +226,13 @@ static gboolean data_set_order_added_predicate (DataSet* self, DataObject* objec static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) { gint64 result = 0LL; - void* _tmp0_ = NULL; - void* _tmp1_ = NULL; + void* _tmp0_; + void* _tmp1_; gint64 _result_ = 0LL; - Comparator _tmp2_ = NULL; - void* _tmp2__target = NULL; - gint64 _tmp7_ = 0LL; - gint64 _tmp11_ = 0LL; + Comparator _tmp2_; + void* _tmp2__target; + gint64 _tmp7_; + gint64 _tmp11_; #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" @@ -256,11 +256,11 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) { #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp2_ != NULL) { #line 259 "DataSet.c" - Comparator _tmp3_ = NULL; - void* _tmp3__target = NULL; - void* _tmp4_ = NULL; - void* _tmp5_ = NULL; - gint64 _tmp6_ = 0LL; + 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; #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -280,9 +280,9 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) { #line 59 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp7_ == ((gint64) 0)) { #line 283 "DataSet.c" - void* _tmp8_ = NULL; - void* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; + 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" @@ -307,9 +307,9 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) { gboolean data_set_contains (DataSet* self, DataObject* object) { gboolean result = FALSE; - GeeHashSet* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = 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" @@ -330,8 +330,8 @@ gboolean data_set_contains (DataSet* self, DataObject* object) { inline gint data_set_get_count (DataSet* self) { gint result = 0; - SortedList* _tmp0_ = NULL; - gint _tmp1_ = 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" @@ -365,7 +365,7 @@ static gint64 _data_set_order_added_comparator_comparator (void* a, void* b, gpo void data_set_reset_comparator (DataSet* self) { - SortedList* _tmp0_ = NULL; + SortedList* _tmp0_; #line 75 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_if_fail (IS_DATA_SET (self)); #line 76 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -386,10 +386,10 @@ void data_set_reset_comparator (DataSet* self) { Comparator data_set_get_comparator (DataSet* self, void** result_target) { Comparator result = NULL; - Comparator _tmp0_ = NULL; - void* _tmp0__target = NULL; - Comparator _tmp1_ = NULL; - void* _tmp1__target = NULL; + Comparator _tmp0_; + void* _tmp0__target; + Comparator _tmp1_; + void* _tmp1__target; #line 81 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), NULL); #line 82 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -412,10 +412,10 @@ Comparator data_set_get_comparator (DataSet* self, void** result_target) { ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target) { ComparatorPredicate result = NULL; - ComparatorPredicate _tmp0_ = NULL; - void* _tmp0__target = NULL; - ComparatorPredicate _tmp1_ = NULL; - void* _tmp1__target = NULL; + ComparatorPredicate _tmp0_; + void* _tmp0__target; + ComparatorPredicate _tmp1_; + void* _tmp1__target; #line 85 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), NULL); #line 86 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -446,11 +446,11 @@ static gint64 _data_set_comparator_wrapper_comparator (void* a, void* b, gpointe void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target) { - Comparator _tmp0_ = NULL; - void* _tmp0__target = NULL; - ComparatorPredicate _tmp1_ = NULL; - void* _tmp1__target = NULL; - SortedList* _tmp2_ = NULL; + Comparator _tmp0_; + void* _tmp0__target; + ComparatorPredicate _tmp1_; + void* _tmp1__target; + SortedList* _tmp2_; #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" @@ -479,9 +479,9 @@ void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* u GeeList* data_set_get_all (DataSet* self) { GeeList* result = NULL; - SortedList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + SortedList* _tmp0_; + GeeList* _tmp1_; + GeeList* _tmp2_; #line 95 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), NULL); #line 96 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -501,11 +501,11 @@ GeeList* data_set_get_all (DataSet* self) { DataSet* data_set_copy (DataSet* self) { DataSet* result = NULL; DataSet* clone = NULL; - DataSet* _tmp0_ = NULL; - SortedList* _tmp1_ = NULL; - SortedList* _tmp2_ = NULL; - GeeHashSet* _tmp3_ = NULL; - GeeHashSet* _tmp4_ = NULL; + DataSet* _tmp0_; + SortedList* _tmp1_; + SortedList* _tmp2_; + GeeHashSet* _tmp3_; + GeeHashSet* _tmp4_; #line 99 "/home/jens/Source/shotwell/src/core/DataSet.vala" g_return_val_if_fail (IS_DATA_SET (self), NULL); #line 100 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -536,9 +536,9 @@ DataSet* data_set_copy (DataSet* self) { DataObject* data_set_get_at (DataSet* self, gint index) { DataObject* result = NULL; - SortedList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gpointer _tmp2_ = NULL; + SortedList* _tmp0_; + gint _tmp1_; + gpointer _tmp2_; #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" @@ -557,10 +557,10 @@ DataObject* data_set_get_at (DataSet* self, gint index) { gint data_set_index_of (DataSet* self, DataObject* object) { gint result = 0; - SortedList* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - GEqualFunc _tmp2_ = NULL; - gint _tmp3_ = 0; + SortedList* _tmp0_; + DataObject* _tmp1_; + GEqualFunc _tmp2_; + gint _tmp3_; #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" @@ -583,12 +583,12 @@ gint data_set_index_of (DataSet* self, DataObject* object) { gboolean data_set_add (DataSet* self, DataObject* object) { gboolean result = FALSE; - SortedList* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp3_ = NULL; - DataObject* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + SortedList* _tmp0_; + DataObject* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp3_; + DataObject* _tmp4_; + gboolean _tmp5_; #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" @@ -616,8 +616,8 @@ gboolean data_set_add (DataSet* self, DataObject* object) { #line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (!_tmp5_) { #line 619 "DataSet.c" - SortedList* _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; + SortedList* _tmp6_; + DataObject* _tmp7_; #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp6_ = self->priv->list; #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -641,16 +641,16 @@ gboolean data_set_add (DataSet* self, DataObject* object) { gboolean data_set_add_many (DataSet* self, GeeCollection* objects) { gboolean result = FALSE; gint count = 0; - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - SortedList* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - GeeHashSet* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + SortedList* _tmp4_; + GeeCollection* _tmp5_; + gboolean _tmp6_; + GeeHashSet* _tmp7_; + GeeCollection* _tmp8_; + gboolean _tmp9_; #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" @@ -696,8 +696,8 @@ gboolean data_set_add_many (DataSet* self, GeeCollection* objects) { #line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (!_tmp9_) { #line 699 "DataSet.c" - SortedList* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; + SortedList* _tmp10_; + GeeCollection* _tmp11_; #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp10_ = self->priv->list; #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -721,12 +721,12 @@ gboolean data_set_add_many (DataSet* self, GeeCollection* objects) { gboolean data_set_remove (DataSet* self, DataObject* object) { gboolean result = FALSE; gboolean success = FALSE; - SortedList* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp3_ = NULL; - DataObject* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + SortedList* _tmp0_; + DataObject* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp3_; + DataObject* _tmp4_; + gboolean _tmp5_; #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" @@ -768,12 +768,12 @@ gboolean data_set_remove (DataSet* self, DataObject* object) { gboolean data_set_remove_many (DataSet* self, GeeCollection* objects) { gboolean result = FALSE; gboolean success = FALSE; - SortedList* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashSet* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + SortedList* _tmp0_; + GeeCollection* _tmp1_; + gboolean _tmp2_; + GeeHashSet* _tmp3_; + GeeCollection* _tmp4_; + gboolean _tmp5_; #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" @@ -816,11 +816,11 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - ComparatorPredicate _tmp2_ = NULL; - void* _tmp2__target = NULL; - SortedList* _tmp8_ = NULL; - DataObject* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + ComparatorPredicate _tmp2_; + void* _tmp2__target; + SortedList* _tmp8_; + DataObject* _tmp9_; + gboolean _tmp10_; #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" @@ -834,7 +834,7 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp2_ != NULL) { #line 837 "DataSet.c" - Alteration* _tmp3_ = NULL; + Alteration* _tmp3_; #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" _tmp3_ = alteration; #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -848,11 +848,11 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (_tmp1_) { #line 851 "DataSet.c" - ComparatorPredicate _tmp4_ = NULL; - void* _tmp4__target = NULL; - DataObject* _tmp5_ = NULL; - Alteration* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + 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" @@ -935,7 +935,7 @@ static gchar* value_data_set_collect_value (GValue* value, guint n_collect_value #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (collect_values[0].v_pointer) { #line 938 "DataSet.c" - DataSet* object; + 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) { @@ -962,7 +962,7 @@ static gchar* value_data_set_collect_value (GValue* value, guint n_collect_value static gchar* value_data_set_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - DataSet** object_p; + DataSet ** object_p; object_p = collect_values[0].v_pointer; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (!object_p) { @@ -1014,7 +1014,7 @@ gpointer value_get_data_set (const GValue* value) { void value_set_data_set (GValue* value, gpointer v_object) { - DataSet* old; + 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)); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -1045,7 +1045,7 @@ void value_set_data_set (GValue* value, gpointer v_object) { void value_take_data_set (GValue* value, gpointer v_object) { - DataSet* old; + 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)); #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -1085,8 +1085,8 @@ static void data_set_class_init (DataSetClass * klass) { static void data_set_instance_init (DataSet * self) { - SortedList* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; + SortedList* _tmp0_; + GeeHashSet* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" self->priv = DATA_SET_GET_PRIVATE (self); #line 30 "/home/jens/Source/shotwell/src/core/DataSet.vala" @@ -1099,15 +1099,19 @@ static void data_set_instance_init (DataSet * self) { self->priv->hash_set = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala" self->priv->user_comparator = NULL; +#line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala" + self->priv->user_comparator_target = self; #line 33 "/home/jens/Source/shotwell/src/core/DataSet.vala" self->priv->comparator_predicate = NULL; +#line 33 "/home/jens/Source/shotwell/src/core/DataSet.vala" + self->priv->comparator_predicate_target = self; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" self->ref_count = 1; -#line 1107 "DataSet.c" +#line 1111 "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); @@ -1117,7 +1121,7 @@ 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 1121 "DataSet.c" +#line 1125 "DataSet.c" } @@ -1136,18 +1140,18 @@ GType data_set_get_type (void) { gpointer data_set_ref (gpointer instance) { - DataSet* self; + 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 1146 "DataSet.c" +#line 1150 "DataSet.c" } void data_set_unref (gpointer instance) { - DataSet* self; + DataSet * self; self = instance; #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1155,7 +1159,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 1159 "DataSet.c" +#line 1163 "DataSet.c" } } diff --git a/src/core/DataSource.c b/src/core/DataSource.c index c95b8ce..dc02548 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -1,4 +1,4 @@ -/* DataSource.c generated by valac 0.34.7, the Vala compiler +/* DataSource.c generated by valac 0.36.6, the Vala compiler * generated from DataSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -143,8 +143,20 @@ typedef struct _SourceBacklinkClass SourceBacklinkClass; #define _source_backlink_unref0(var) ((var == NULL) ? NULL : (var = (source_backlink_unref (var), NULL))) #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +enum { + DATA_SOURCE_UNLINKED_SIGNAL, + DATA_SOURCE_RELINKED_SIGNAL, + DATA_SOURCE_DESTROYED_SIGNAL, + DATA_SOURCE_LAST_SIGNAL +}; +static guint data_source_signals[DATA_SOURCE_LAST_SIGNAL] = {0}; typedef struct _SourceSnapshotPrivate SourceSnapshotPrivate; typedef struct _ParamSpecSourceSnapshot ParamSpecSourceSnapshot; +enum { + SOURCE_SNAPSHOT_BROKEN_SIGNAL, + SOURCE_SNAPSHOT_LAST_SIGNAL +}; +static guint source_snapshot_signals[SOURCE_SNAPSHOT_LAST_SIGNAL] = {0}; typedef struct _SourceBacklinkPrivate SourceBacklinkPrivate; typedef struct _ParamSpecSourceBacklink ParamSpecSourceBacklink; @@ -160,6 +172,13 @@ typedef struct _SourceProxyClass SourceProxyClass; typedef struct _SourceProxyPrivate SourceProxyPrivate; #define _source_snapshot_unref0(var) ((var == NULL) ? NULL : (var = (source_snapshot_unref (var), NULL))) typedef struct _ParamSpecSourceProxy ParamSpecSourceProxy; +enum { + SOURCE_PROXY_RECONSTITUTED_SIGNAL, + SOURCE_PROXY_DEHYDRATED_SIGNAL, + SOURCE_PROXY_BROKEN_SIGNAL, + SOURCE_PROXY_LAST_SIGNAL +}; +static guint source_proxy_signals[SOURCE_PROXY_LAST_SIGNAL] = {0}; #define TYPE_PROXYABLE (proxyable_get_type ()) #define PROXYABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROXYABLE, Proxyable)) @@ -406,14 +425,14 @@ 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_add63 (DataView*** array, int* length, int* size, DataView* value); +static void _vala_array_add63 (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); +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 @@ -423,7 +442,7 @@ static void source_snapshot_real_notify_broken (SourceSnapshot* self); gboolean source_snapshot_is_broken (SourceSnapshot* self); SourceSnapshot* source_snapshot_construct (GType object_type); static void source_snapshot_real_broken (SourceSnapshot* self); -static void source_snapshot_finalize (SourceSnapshot* obj); +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 @@ -436,7 +455,7 @@ guint source_backlink_hash_func (SourceBacklink* backlink); 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); +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); @@ -471,7 +490,7 @@ 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); +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); @@ -481,23 +500,23 @@ static gint _vala_array_length (gpointer array); DataSource* data_source_construct (GType object_type, gint64 object_id) { DataSource * self = NULL; - gint64 _tmp0_ = 0LL; + 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_); #line 63 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 492 "DataSource.c" +#line 511 "DataSource.c" } static void data_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) { DataSource * self; - DataCollection* _tmp0_ = NULL; + DataCollection* _tmp0_; gboolean _tmp5_ = FALSE; - DataCollection* _tmp6_ = NULL; - DataCollection* _tmp8_ = NULL; + DataCollection* _tmp6_; + DataCollection* _tmp8_; #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" @@ -506,78 +525,78 @@ static void data_source_real_notify_membership_changed (DataObject* base, DataCo _tmp0_ = collection; #line 75 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_ == NULL) { -#line 510 "DataSource.c" +#line 529 "DataSource.c" gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->is_destroyed; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp2_) { #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = TRUE; -#line 519 "DataSource.c" +#line 538 "DataSource.c" } else { - GeeHashMap* _tmp3_ = NULL; + GeeHashMap* _tmp3_; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->backlinks; #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = _tmp3_ != NULL; -#line 526 "DataSource.c" +#line 545 "DataSource.c" } #line 76 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp1_, "is_destroyed || backlinks != null"); -#line 530 "DataSource.c" +#line 549 "DataSource.c" } else { - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = self->priv->is_destroyed; #line 78 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (!_tmp4_, "!is_destroyed"); -#line 537 "DataSource.c" +#line 556 "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 543 "DataSource.c" - GeeHashMap* _tmp7_ = NULL; +#line 562 "DataSource.c" + GeeHashMap* _tmp7_; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = self->priv->backlinks; #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = _tmp7_ != NULL; -#line 549 "DataSource.c" +#line 568 "DataSource.c" } else { #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = FALSE; -#line 553 "DataSource.c" +#line 572 "DataSource.c" } #line 82 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp5_) { #line 83 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_notify_unlinked (self); -#line 559 "DataSource.c" +#line 578 "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 565 "DataSource.c" +#line 584 "DataSource.c" } 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 572 "DataSource.c" +#line 591 "DataSource.c" } static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldingTank* holding_tank) { - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; - SourceHoldingTank* _tmp2_ = NULL; - SourceHoldingTank* _tmp5_ = NULL; - SourceHoldingTank* _tmp6_ = NULL; + DataCollection* _tmp0_; + DataCollection* _tmp1_; + SourceHoldingTank* _tmp2_; + SourceHoldingTank* _tmp5_; + SourceHoldingTank* _tmp6_; #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" @@ -592,20 +611,20 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin _tmp2_ = holding_tank; #line 94 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp2_ != NULL) { -#line 596 "DataSource.c" - SourceHoldingTank* _tmp3_ = NULL; +#line 615 "DataSource.c" + SourceHoldingTank* _tmp3_; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->holding_tank; #line 95 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp3_ == NULL, "this.holding_tank == null"); -#line 602 "DataSource.c" +#line 621 "DataSource.c" } else { - SourceHoldingTank* _tmp4_ = NULL; + SourceHoldingTank* _tmp4_; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = self->priv->holding_tank; #line 97 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp4_ != NULL, "this.holding_tank != null"); -#line 609 "DataSource.c" +#line 628 "DataSource.c" } #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = holding_tank; @@ -615,7 +634,7 @@ static void data_source_real_notify_held_in_tank (DataSource* self, SourceHoldin _source_holding_tank_unref0 (self->priv->holding_tank); #line 100 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->holding_tank = _tmp6_; -#line 619 "DataSource.c" +#line 638 "DataSource.c" } @@ -624,13 +643,13 @@ void data_source_notify_held_in_tank (DataSource* self, SourceHoldingTank* holdi 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 628 "DataSource.c" +#line 647 "DataSource.c" } static void data_source_real_notify_altered (DataObject* base, Alteration* alteration) { DataSource * self; - SourceHoldingTank* _tmp0_ = NULL; + SourceHoldingTank* _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_SOURCE, DataSource); #line 103 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -639,19 +658,19 @@ 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 643 "DataSource.c" - SourceHoldingTank* _tmp1_ = NULL; - Alteration* _tmp2_ = NULL; +#line 662 "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 652 "DataSource.c" +#line 671 "DataSource.c" } else { - Alteration* _tmp3_ = NULL; - Alteration* _tmp4_ = NULL; + 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" @@ -660,33 +679,33 @@ static void data_source_real_notify_altered (DataObject* base, Alteration* alter _tmp4_ = 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 664 "DataSource.c" +#line 683 "DataSource.c" } } static void data_source_real_notify_unlinking (DataSource* self, SourceCollection* collection) { gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; - SourceCollection* _tmp3_ = NULL; - GeeHashMap* _tmp4_ = NULL; + GeeHashMap* _tmp1_; + SourceCollection* _tmp3_; + GeeHashMap* _tmp4_; #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 680 "DataSource.c" - SourceCollection* _tmp2_ = NULL; +#line 699 "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 686 "DataSource.c" +#line 705 "DataSource.c" } else { #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 690 "DataSource.c" +#line 709 "DataSource.c" } #line 116 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks == null && unlinked_from_collection == null"); @@ -700,7 +719,7 @@ static void data_source_real_notify_unlinking (DataSource* self, SourceCollectio _g_object_unref0 (self->priv->backlinks); #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->backlinks = _tmp4_; -#line 704 "DataSource.c" +#line 723 "DataSource.c" } @@ -709,39 +728,39 @@ void data_source_notify_unlinking (DataSource* self, SourceCollection* collectio 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 713 "DataSource.c" +#line 732 "DataSource.c" } static void data_source_real_notify_unlinked (DataSource* self) { gboolean _tmp0_ = FALSE; - SourceCollection* _tmp1_ = NULL; - SourceCollection* _tmp3_ = NULL; - GeeHashMap* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + SourceCollection* _tmp1_; + SourceCollection* _tmp3_; + GeeHashMap* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->unlinked_from_collection; #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 728 "DataSource.c" - GeeHashMap* _tmp2_ = NULL; +#line 747 "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 734 "DataSource.c" +#line 753 "DataSource.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 738 "DataSource.c" +#line 757 "DataSource.c" } #line 124 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "unlinked_from_collection != null && backlinks != null"); #line 126 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->unlinked_from_collection; #line 126 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "unlinked", _tmp3_); + g_signal_emit (self, data_source_signals[DATA_SOURCE_UNLINKED_SIGNAL], 0, _tmp3_); #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = self->priv->backlinks; #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -750,10 +769,10 @@ 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 754 "DataSource.c" - SourceCollection* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 773 "DataSource.c" + SourceCollection* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = self->priv->unlinked_from_collection; #line 130 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -764,7 +783,7 @@ 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 768 "DataSource.c" +#line 787 "DataSource.c" } } @@ -774,37 +793,37 @@ void data_source_notify_unlinked (DataSource* self) { 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 778 "DataSource.c" +#line 797 "DataSource.c" } static void data_source_real_notify_relinking (DataSource* self, SourceCollection* collection) { gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp1_; #line 134 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_COLLECTION (collection)); #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 791 "DataSource.c" - SourceCollection* _tmp2_ = NULL; - SourceCollection* _tmp3_ = NULL; +#line 810 "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 800 "DataSource.c" +#line 819 "DataSource.c" } else { #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 804 "DataSource.c" +#line 823 "DataSource.c" } #line 135 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "(backlinks != null) && (unlinked_from_collection == collection)"); -#line 808 "DataSource.c" +#line 827 "DataSource.c" } @@ -813,38 +832,38 @@ void data_source_notify_relinking (DataSource* self, SourceCollection* collectio 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 817 "DataSource.c" +#line 836 "DataSource.c" } 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 824 "DataSource.c" +#line 843 "DataSource.c" } static void data_source_real_notify_relinked (DataSource* self) { gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp1_; SourceCollection* relinked_to = NULL; - SourceCollection* _tmp3_ = NULL; - SourceCollection* _tmp4_ = NULL; + SourceCollection* _tmp3_; + SourceCollection* _tmp4_; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_ != NULL) { -#line 838 "DataSource.c" - SourceCollection* _tmp2_ = NULL; +#line 857 "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 844 "DataSource.c" +#line 863 "DataSource.c" } else { #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 848 "DataSource.c" +#line 867 "DataSource.c" } #line 140 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "backlinks != null && unlinked_from_collection != null"); @@ -861,12 +880,12 @@ static void data_source_real_notify_relinked (DataSource* self) { #line 144 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->unlinked_from_collection = NULL; #line 145 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "relinked", relinked_to); + g_signal_emit (self, data_source_signals[DATA_SOURCE_RELINKED_SIGNAL], 0, relinked_to); #line 148 "/home/jens/Source/shotwell/src/core/DataSource.vala" data_source_commit_backlinks (self, NULL, NULL); #line 139 "/home/jens/Source/shotwell/src/core/DataSource.vala" _data_collection_unref0 (relinked_to); -#line 870 "DataSource.c" +#line 889 "DataSource.c" } @@ -875,7 +894,7 @@ void data_source_notify_relinked (DataSource* self) { 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 879 "DataSource.c" +#line 898 "DataSource.c" } @@ -884,7 +903,7 @@ static gchar* data_source_real_get_typename (DataSource* self) { 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 888 "DataSource.c" +#line 907 "DataSource.c" } @@ -893,7 +912,7 @@ gchar* data_source_get_typename (DataSource* self) { 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 897 "DataSource.c" +#line 916 "DataSource.c" } @@ -903,7 +922,7 @@ static gint64 data_source_real_get_instance_id (DataSource* self) { 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 907 "DataSource.c" +#line 926 "DataSource.c" } @@ -912,17 +931,17 @@ gint64 data_source_get_instance_id (DataSource* self) { 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 916 "DataSource.c" +#line 935 "DataSource.c" } static gchar* data_source_real_get_source_id (DataSource* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gint64 _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" @@ -939,7 +958,7 @@ static gchar* data_source_real_get_source_id (DataSource* self) { result = _tmp4_; #line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 943 "DataSource.c" +#line 962 "DataSource.c" } @@ -948,21 +967,21 @@ gchar* data_source_get_source_id (DataSource* self) { 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 952 "DataSource.c" +#line 971 "DataSource.c" } gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeHashMap* _tmp1_; + SourceBacklink* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; gboolean _tmp6_ = FALSE; - GeeList* _tmp7_ = NULL; + GeeList* _tmp7_; #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" @@ -975,7 +994,7 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { result = FALSE; #line 172 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 979 "DataSource.c" +#line 998 "DataSource.c" } #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; @@ -993,12 +1012,12 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { _tmp7_ = values; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ != NULL) { -#line 997 "DataSource.c" - GeeList* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#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; #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1011,11 +1030,11 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { _tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = _tmp12_; -#line 1015 "DataSource.c" +#line 1034 "DataSource.c" } else { #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = FALSE; -#line 1019 "DataSource.c" +#line 1038 "DataSource.c" } #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = _tmp6_; @@ -1023,28 +1042,28 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) { _g_object_unref0 (values); #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1027 "DataSource.c" +#line 1046 "DataSource.c" } 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 1034 "DataSource.c" +#line 1053 "DataSource.c" } GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { GeeList* result = NULL; - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gpointer _tmp3_ = NULL; + GeeHashMap* _tmp1_; + const gchar* _tmp2_; + gpointer _tmp3_; gboolean _tmp4_ = FALSE; - GeeList* _tmp5_ = NULL; + GeeList* _tmp5_; GeeList* backlinks = NULL; - GeeArrayList* _tmp9_ = NULL; + GeeArrayList* _tmp9_; #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" @@ -1057,7 +1076,7 @@ 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 1061 "DataSource.c" +#line 1080 "DataSource.c" } #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; @@ -1073,11 +1092,11 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { if (_tmp5_ == NULL) { #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = TRUE; -#line 1077 "DataSource.c" +#line 1096 "DataSource.c" } else { - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = values; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1086,7 +1105,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _tmp8_ = _tmp7_; #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp4_ = _tmp8_ == 0; -#line 1090 "DataSource.c" +#line 1109 "DataSource.c" } #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp4_) { @@ -1096,21 +1115,21 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _g_object_unref0 (values); #line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1100 "DataSource.c" +#line 1119 "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); #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala" backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList); -#line 1106 "DataSource.c" +#line 1125 "DataSource.c" { GeeList* _value_list = NULL; - GeeList* _tmp10_ = NULL; - GeeList* _tmp11_ = NULL; + GeeList* _tmp10_; + GeeList* _tmp11_; gint _value_size = 0; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; gint _value_index = 0; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = values; @@ -1130,19 +1149,19 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _value_index = -1; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1134 "DataSource.c" - gint _tmp15_ = 0; - gint _tmp16_ = 0; - gint _tmp17_ = 0; +#line 1153 "DataSource.c" + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; gchar* value = NULL; - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gpointer _tmp20_ = NULL; - GeeList* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - SourceBacklink* _tmp24_ = NULL; - SourceBacklink* _tmp25_ = NULL; + GeeList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; + GeeList* _tmp21_; + const gchar* _tmp22_; + const gchar* _tmp23_; + SourceBacklink* _tmp24_; + SourceBacklink* _tmp25_; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = _value_index; #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1155,7 +1174,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { if (!(_tmp16_ < _tmp17_)) { #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1159 "DataSource.c" +#line 1178 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp18_ = _value_list; @@ -1181,11 +1200,11 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) { _source_backlink_unref0 (_tmp25_); #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1185 "DataSource.c" +#line 1204 "DataSource.c" } #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1189 "DataSource.c" +#line 1208 "DataSource.c" } #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala" result = backlinks; @@ -1193,26 +1212,26 @@ 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 1197 "DataSource.c" +#line 1216 "DataSource.c" } void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp13_ = NULL; - SourceBacklink* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; + GeeHashMap* _tmp1_; + SourceBacklink* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp13_; + SourceBacklink* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; SourceCollection* sources = NULL; - DataCollection* _tmp17_ = NULL; - SourceCollection* _tmp18_ = NULL; + DataCollection* _tmp17_; + SourceCollection* _tmp18_; #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" @@ -1237,13 +1256,13 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { _tmp6_ = values; #line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_ == NULL) { -#line 1241 "DataSource.c" - GeeArrayList* _tmp7_ = NULL; - GeeHashMap* _tmp8_ = NULL; - SourceBacklink* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GeeList* _tmp12_ = NULL; +#line 1260 "DataSource.c" + GeeArrayList* _tmp7_; + GeeHashMap* _tmp8_; + SourceBacklink* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + GeeList* _tmp12_; #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); #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1262,7 +1281,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { _tmp12_ = 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 1266 "DataSource.c" +#line 1285 "DataSource.c" } #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp13_ = values; @@ -1282,56 +1301,56 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) { _tmp18_ = sources; #line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp18_ != NULL) { -#line 1286 "DataSource.c" - SourceCollection* _tmp19_ = NULL; - SourceBacklink* _tmp20_ = NULL; +#line 1305 "DataSource.c" + SourceCollection* _tmp19_; + SourceBacklink* _tmp20_; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp19_ = sources; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp20_ = backlink; #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_collection_internal_backlink_set (_tmp19_, self, _tmp20_); -#line 1295 "DataSource.c" +#line 1314 "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 1301 "DataSource.c" +#line 1320 "DataSource.c" } gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeList* values = NULL; - GeeHashMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; + GeeHashMap* _tmp1_; + SourceBacklink* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_; + GeeList* _tmp6_; gint original_size = 0; - GeeList* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + GeeList* _tmp7_; + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; GeeIterator* iter = NULL; - GeeList* _tmp11_ = NULL; - GeeIterator* _tmp12_ = NULL; - GeeList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - SourceCollection* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + GeeList* _tmp11_; + GeeIterator* _tmp12_; + GeeList* _tmp23_; + gint _tmp24_; + gint _tmp25_; + SourceCollection* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; SourceCollection* sources = NULL; - DataCollection* _tmp33_ = NULL; - SourceCollection* _tmp34_ = NULL; - GeeList* _tmp37_ = NULL; - gint _tmp38_ = 0; - gint _tmp39_ = 0; - gint _tmp40_ = 0; + DataCollection* _tmp33_; + SourceCollection* _tmp34_; + GeeList* _tmp37_; + gint _tmp38_; + gint _tmp39_; + gint _tmp40_; #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" @@ -1344,7 +1363,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink result = FALSE; #line 213 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1348 "DataSource.c" +#line 1367 "DataSource.c" } #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->backlinks; @@ -1368,7 +1387,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _g_object_unref0 (values); #line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1372 "DataSource.c" +#line 1391 "DataSource.c" } #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = values; @@ -1390,16 +1409,16 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink iter = _tmp12_; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1394 "DataSource.c" - GeeIterator* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - GeeIterator* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - SourceBacklink* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; +#line 1413 "DataSource.c" + 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; #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1408,7 +1427,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink if (!_tmp14_) { #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1412 "DataSource.c" +#line 1431 "DataSource.c" } #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = iter; @@ -1428,13 +1447,13 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _g_free0 (_tmp17_); #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp21_) { -#line 1432 "DataSource.c" - GeeIterator* _tmp22_ = NULL; +#line 1451 "DataSource.c" + GeeIterator* _tmp22_; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp22_ = iter; #line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala" gee_iterator_remove (_tmp22_); -#line 1438 "DataSource.c" +#line 1457 "DataSource.c" } } #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1445,11 +1464,11 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _tmp25_ = _tmp24_; #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp25_ == 0) { -#line 1449 "DataSource.c" - GeeHashMap* _tmp26_ = NULL; - SourceBacklink* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; +#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; #line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1460,7 +1479,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _tmp29_ = _tmp28_; #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 1464 "DataSource.c" +#line 1483 "DataSource.c" } #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp30_ = self->priv->unlinked_from_collection; @@ -1480,16 +1499,16 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink _tmp34_ = sources; #line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp34_ != NULL) { -#line 1484 "DataSource.c" - SourceCollection* _tmp35_ = NULL; - SourceBacklink* _tmp36_ = NULL; +#line 1503 "DataSource.c" + SourceCollection* _tmp35_; + SourceBacklink* _tmp36_; #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp35_ = 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 1493 "DataSource.c" +#line 1512 "DataSource.c" } #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp37_ = values; @@ -1509,13 +1528,13 @@ 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 1513 "DataSource.c" +#line 1532 "DataSource.c" } static void data_source_real_commit_backlinks (DataSource* self, SourceCollection* sources, const gchar* dehydrated) { gboolean _tmp0_ = FALSE; - SourceCollection* _tmp1_ = NULL; + 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" @@ -1524,20 +1543,20 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio if (_tmp1_ != NULL) { #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1528 "DataSource.c" +#line 1547 "DataSource.c" } else { - const gchar* _tmp2_ = NULL; + 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 1535 "DataSource.c" +#line 1554 "DataSource.c" } #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { -#line 1539 "DataSource.c" - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; +#line 1558 "DataSource.c" + gchar* _tmp3_; + gchar* _tmp4_; #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)); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1546,7 +1565,7 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp4_); #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp4_); -#line 1550 "DataSource.c" +#line 1569 "DataSource.c" } } @@ -1556,22 +1575,22 @@ void data_source_commit_backlinks (DataSource* self, SourceCollection* sources, 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 1560 "DataSource.c" +#line 1579 "DataSource.c" } static gchar* data_source_dehydrate_backlinks (DataSource* self) { gchar* result = NULL; gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp1_; GString* builder = NULL; - GString* _tmp5_ = NULL; + GString* _tmp5_; const gchar* _tmp51_ = NULL; - GString* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; - gint _tmp54_ = 0; - gint _tmp55_ = 0; - gchar* _tmp58_ = NULL; + GString* _tmp52_; + const gchar* _tmp53_; + gint _tmp54_; + gint _tmp55_; + gchar* _tmp58_; #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" @@ -1580,11 +1599,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (_tmp1_ == NULL) { #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = TRUE; -#line 1584 "DataSource.c" +#line 1603 "DataSource.c" } else { - GeeHashMap* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeHashMap* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->backlinks; #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1593,7 +1612,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 1597 "DataSource.c" +#line 1616 "DataSource.c" } #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { @@ -1601,21 +1620,21 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { result = NULL; #line 255 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1605 "DataSource.c" +#line 1624 "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 1611 "DataSource.c" +#line 1630 "DataSource.c" { GeeIterator* _name_it = NULL; - GeeHashMap* _tmp6_ = NULL; - GeeSet* _tmp7_ = NULL; - GeeSet* _tmp8_ = NULL; - GeeSet* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + GeeHashMap* _tmp6_; + GeeSet* _tmp7_; + GeeSet* _tmp8_; + GeeSet* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6_ = self->priv->backlinks; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1634,23 +1653,23 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _name_it = _tmp11_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1638 "DataSource.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 1657 "DataSource.c" + GeeIterator* _tmp12_; + gboolean _tmp13_; gchar* name = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; + GeeIterator* _tmp14_; + gpointer _tmp15_; GeeList* values = NULL; - GeeHashMap* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; + GeeHashMap* _tmp16_; + const gchar* _tmp17_; + gpointer _tmp18_; gboolean _tmp19_ = FALSE; - GeeList* _tmp20_ = NULL; + GeeList* _tmp20_; gchar* value_field = NULL; - gchar* _tmp24_ = NULL; - const gchar* _tmp43_ = NULL; - gint _tmp44_ = 0; - gint _tmp45_ = 0; + gchar* _tmp24_; + const gchar* _tmp43_; + gint _tmp44_; + gint _tmp45_; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = _name_it; #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1659,7 +1678,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (!_tmp13_) { #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1663 "DataSource.c" +#line 1682 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp14_ = _name_it; @@ -1681,11 +1700,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (_tmp20_ == NULL) { #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp19_ = TRUE; -#line 1685 "DataSource.c" +#line 1704 "DataSource.c" } else { - GeeList* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; + GeeList* _tmp21_; + gint _tmp22_; + gint _tmp23_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp21_ = values; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1694,7 +1713,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp23_ = _tmp22_; #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp19_ = _tmp23_ == 0; -#line 1698 "DataSource.c" +#line 1717 "DataSource.c" } #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp19_) { @@ -1704,21 +1723,21 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _g_free0 (name); #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 1708 "DataSource.c" +#line 1727 "DataSource.c" } #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp24_ = g_strdup (""); #line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala" value_field = _tmp24_; -#line 1714 "DataSource.c" +#line 1733 "DataSource.c" { GeeList* _value_list = NULL; - GeeList* _tmp25_ = NULL; - GeeList* _tmp26_ = NULL; + GeeList* _tmp25_; + GeeList* _tmp26_; gint _value_size = 0; - GeeList* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; + GeeList* _tmp27_; + gint _tmp28_; + gint _tmp29_; gint _value_index = 0; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp25_ = values; @@ -1738,16 +1757,16 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _value_index = -1; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 1742 "DataSource.c" - gint _tmp30_ = 0; - gint _tmp31_ = 0; - gint _tmp32_ = 0; +#line 1761 "DataSource.c" + gint _tmp30_; + gint _tmp31_; + gint _tmp32_; gchar* value = NULL; - GeeList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gpointer _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - gboolean _tmp37_ = FALSE; + GeeList* _tmp33_; + gint _tmp34_; + gpointer _tmp35_; + const gchar* _tmp36_; + gboolean _tmp37_; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp30_ = _value_index; #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1760,7 +1779,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { if (!(_tmp31_ < _tmp32_)) { #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 1764 "DataSource.c" +#line 1783 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp33_ = _value_list; @@ -1776,12 +1795,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp37_ = is_string_empty (_tmp36_); #line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp37_) { -#line 1780 "DataSource.c" - const gchar* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; +#line 1799 "DataSource.c" + const gchar* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp38_ = value_field; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1798,15 +1817,15 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { value_field = _tmp42_; #line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp41_); -#line 1802 "DataSource.c" +#line 1821 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 1806 "DataSource.c" +#line 1825 "DataSource.c" } #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_value_list); -#line 1810 "DataSource.c" +#line 1829 "DataSource.c" } #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp43_ = value_field; @@ -1816,12 +1835,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp45_ = _tmp44_; #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp45_ > 0) { -#line 1820 "DataSource.c" - GString* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; +#line 1839 "DataSource.c" + GString* _tmp46_; + const gchar* _tmp47_; + const gchar* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp46_ = builder; #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1836,7 +1855,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { g_string_append (_tmp46_, _tmp50_); #line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp50_); -#line 1840 "DataSource.c" +#line 1859 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value_field); @@ -1844,11 +1863,11 @@ 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 1848 "DataSource.c" +#line 1867 "DataSource.c" } #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_name_it); -#line 1852 "DataSource.c" +#line 1871 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp52_ = builder; @@ -1860,20 +1879,20 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _tmp55_ = _tmp54_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp55_ > 0) { -#line 1864 "DataSource.c" - GString* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; +#line 1883 "DataSource.c" + GString* _tmp56_; + const gchar* _tmp57_; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp56_ = builder; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp57_ = _tmp56_->str; #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp51_ = _tmp57_; -#line 1873 "DataSource.c" +#line 1892 "DataSource.c" } else { #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp51_ = NULL; -#line 1877 "DataSource.c" +#line 1896 "DataSource.c" } #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp58_ = g_strdup (_tmp51_); @@ -1883,22 +1902,22 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) { _g_string_free0 (builder); #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 1887 "DataSource.c" +#line 1906 "DataSource.c" } void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated) { - SourceCollection* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + SourceCollection* _tmp0_; + GeeHashMap* _tmp1_; + const gchar* _tmp2_; gchar** lines = NULL; - const gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint lines_length1 = 0; - gint _lines_size_ = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + const gchar* _tmp3_; + gchar** _tmp4_; + gchar** _tmp5_; + gint lines_length1; + gint _lines_size_; + gchar** _tmp6_; + gint _tmp6__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" @@ -1919,7 +1938,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink if (_tmp2_ == NULL) { #line 283 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 1923 "DataSource.c" +#line 1942 "DataSource.c" } #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = dehydrated; @@ -1935,7 +1954,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp6_ = lines; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp6__length1 = lines_length1; -#line 1939 "DataSource.c" +#line 1958 "DataSource.c" { gchar** line_collection = NULL; gint line_collection_length1 = 0; @@ -1947,41 +1966,41 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink line_collection_length1 = _tmp6__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 1951 "DataSource.c" - gchar* _tmp7_ = NULL; +#line 1970 "DataSource.c" + gchar* _tmp7_; gchar* line = NULL; #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp7_ = g_strdup (line_collection[line_it]); #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" line = _tmp7_; -#line 1958 "DataSource.c" +#line 1977 "DataSource.c" { - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; gchar** tokens = NULL; - const gchar* _tmp11_ = NULL; - gchar** _tmp12_ = NULL; - gchar** _tmp13_ = NULL; - gint tokens_length1 = 0; - gint _tokens_size_ = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; + const gchar* _tmp11_; + gchar** _tmp12_; + gchar** _tmp13_; + gint tokens_length1; + gint _tokens_size_; + gchar** _tmp14_; + gint _tmp14__length1; gchar** decoded_values = NULL; - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - const gchar* _tmp19_ = NULL; - gchar** _tmp20_ = NULL; - gchar** _tmp21_ = NULL; - gint decoded_values_length1 = 0; - gint _decoded_values_size_ = 0; + 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_ = NULL; - gchar** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - GeeList* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint _tmp34_ = 0; + GeeArrayList* _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; + GeeList* _tmp32_; + gint _tmp33_; + gint _tmp34_; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = line; #line 287 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -1994,7 +2013,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _g_free0 (line); #line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 1998 "DataSource.c" +#line 2017 "DataSource.c" } #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp11_ = line; @@ -2012,10 +2031,10 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp14__length1 = tokens_length1; #line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp14__length1 < 2) { -#line 2016 "DataSource.c" - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; +#line 2035 "DataSource.c" + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = line; #line 292 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2033,7 +2052,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _g_free0 (line); #line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 2036 "DataSource.c" +#line 2055 "DataSource.c" } #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp18_ = tokens; @@ -2057,7 +2076,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp23_ = decoded_values; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp23__length1 = decoded_values_length1; -#line 2060 "DataSource.c" +#line 2079 "DataSource.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; @@ -2069,25 +2088,25 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink value_collection_length1 = _tmp23__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 2072 "DataSource.c" - gchar* _tmp24_ = NULL; +#line 2091 "DataSource.c" + gchar* _tmp24_; gchar* value = NULL; #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp24_ = g_strdup (value_collection[value_it]); #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" value = _tmp24_; -#line 2079 "DataSource.c" +#line 2098 "DataSource.c" { gboolean _tmp25_ = FALSE; - const gchar* _tmp26_ = NULL; + const gchar* _tmp26_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp26_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp26_ != NULL) { -#line 2087 "DataSource.c" - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; +#line 2106 "DataSource.c" + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp27_ = value; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2096,28 +2115,28 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp29_ = _tmp28_; #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp25_ = _tmp29_ > 0; -#line 2099 "DataSource.c" +#line 2118 "DataSource.c" } else { #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp25_ = FALSE; -#line 2103 "DataSource.c" +#line 2122 "DataSource.c" } #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp25_) { -#line 2107 "DataSource.c" - GeeList* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; +#line 2126 "DataSource.c" + GeeList* _tmp30_; + const gchar* _tmp31_; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp30_ = values; #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp31_ = 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 2116 "DataSource.c" +#line 2135 "DataSource.c" } #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (value); -#line 2120 "DataSource.c" +#line 2139 "DataSource.c" } } } @@ -2129,12 +2148,12 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp34_ = _tmp33_; #line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp34_ > 0) { -#line 2132 "DataSource.c" - GeeHashMap* _tmp35_ = NULL; - gchar** _tmp36_ = NULL; - gint _tmp36__length1 = 0; - const gchar* _tmp37_ = NULL; - GeeList* _tmp38_ = NULL; +#line 2151 "DataSource.c" + GeeHashMap* _tmp35_; + gchar** _tmp36_; + gint _tmp36__length1; + const gchar* _tmp37_; + GeeList* _tmp38_; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp35_ = self->priv->backlinks; #line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2147,7 +2166,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink _tmp38_ = 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 2150 "DataSource.c" +#line 2169 "DataSource.c" } #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (values); @@ -2157,13 +2176,13 @@ 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 2160 "DataSource.c" +#line 2179 "DataSource.c" } } } #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala" lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL); -#line 2166 "DataSource.c" +#line 2185 "DataSource.c" } @@ -2173,7 +2192,7 @@ static SourceSnapshot* data_source_real_save_snapshot (DataSource* self) { result = NULL; #line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2176 "DataSource.c" +#line 2195 "DataSource.c" } @@ -2182,7 +2201,7 @@ SourceSnapshot* data_source_save_snapshot (DataSource* self) { 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 2185 "DataSource.c" +#line 2204 "DataSource.c" } @@ -2191,7 +2210,7 @@ void data_source_internal_mark_for_destroy (DataSource* self) { 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 2194 "DataSource.c" +#line 2213 "DataSource.c" } @@ -2201,7 +2220,7 @@ static gboolean data_source_real_internal_delete_backing (DataSource* self, GErr result = TRUE; #line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2204 "DataSource.c" +#line 2223 "DataSource.c" } @@ -2210,13 +2229,13 @@ gboolean data_source_internal_delete_backing (DataSource* self, GError** error) 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 2213 "DataSource.c" +#line 2232 "DataSource.c" } static gboolean data_source_real_equals (DataSource* self, DataSource* source) { gboolean result = FALSE; - DataSource* _tmp0_ = NULL; + 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" @@ -2225,7 +2244,7 @@ static gboolean data_source_real_equals (DataSource* self, DataSource* source) { result = self == _tmp0_; #line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 2228 "DataSource.c" +#line 2247 "DataSource.c" } @@ -2234,47 +2253,47 @@ gboolean data_source_equals (DataSource* self, DataSource* source) { 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 2237 "DataSource.c" +#line 2256 "DataSource.c" } static void data_source_real_destroy (DataSource* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = self->priv->marked_for_destroy; #line 341 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_assert (_tmp0_, "marked_for_destroy"); #line 344 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->is_destroyed = TRUE; -#line 2249 "DataSource.c" +#line 2268 "DataSource.c" { gint ctr = 0; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2254 "DataSource.c" +#line 2273 "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 2261 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2280 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2271 "DataSource.c" - gint _tmp2_ = 0; +#line 2290 "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 2277 "DataSource.c" +#line 2296 "DataSource.c" } #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2288,7 +2307,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 2291 "DataSource.c" +#line 2310 "DataSource.c" } #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2300,18 +2319,18 @@ 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 2303 "DataSource.c" +#line 2322 "DataSource.c" DataView* view = NULL; - DataView** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - DataView* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - DataView** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - DataView* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; + DataView** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + DataView* _tmp10_; + DataView* _tmp11_; + DataView** _tmp12_; + gint _tmp12__length1; + gint _tmp13_; + DataView* _tmp14_; + DataView* _tmp15_; #line 349 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ = self->priv->subscribers; #line 349 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2342,14 +2361,14 @@ 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 2345 "DataSource.c" +#line 2364 "DataSource.c" } } } } #line 357 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "destroyed"); -#line 2352 "DataSource.c" + g_signal_emit (self, data_source_signals[DATA_SOURCE_DESTROYED_SIGNAL], 0); +#line 2371 "DataSource.c" } @@ -2358,15 +2377,15 @@ void data_source_destroy (DataSource* self) { 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 2361 "DataSource.c" +#line 2380 "DataSource.c" } gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) { gboolean result = FALSE; gboolean ret = FALSE; - gboolean _tmp0_ = FALSE; - SourceCollection* _tmp11_ = NULL; + gboolean _tmp0_; + SourceCollection* _tmp11_; GError * _inner_error_ = NULL; #line 366 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE); @@ -2376,18 +2395,18 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _tmp0_ = delete_backing; #line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp0_) { -#line 2379 "DataSource.c" +#line 2398 "DataSource.c" { gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_; + gboolean _tmp3_; #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = data_source_internal_delete_backing (self, &_inner_error_); #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = _tmp2_; #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2390 "DataSource.c" +#line 2409 "DataSource.c" goto __catch50_g_error; } #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2396,9 +2415,9 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _tmp3_ = ret; #line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp3_) { -#line 2399 "DataSource.c" - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; +#line 2418 "DataSource.c" + gchar* _tmp4_; + gchar* _tmp5_; #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)); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2407,17 +2426,17 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp5_); #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_free0 (_tmp5_); -#line 2410 "DataSource.c" +#line 2429 "DataSource.c" } } goto __finally50; __catch50_g_error: { GError* err = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + gchar* _tmp6_; + gchar* _tmp7_; + GError* _tmp8_; + const gchar* _tmp9_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" err = _inner_error_; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2438,12 +2457,12 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) ret = FALSE; #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_error_free0 (err); -#line 2441 "DataSource.c" +#line 2460 "DataSource.c" } __finally50: #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2446 "DataSource.c" +#line 2465 "DataSource.c" gboolean _tmp10_ = 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); @@ -2451,7 +2470,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) g_clear_error (&_inner_error_); #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" return _tmp10_; -#line 2454 "DataSource.c" +#line 2473 "DataSource.c" } } #line 380 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2462,45 +2481,45 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _tmp11_ = self->priv->unlinked_from_collection; #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp11_ != NULL) { -#line 2465 "DataSource.c" - SourceCollection* _tmp12_ = NULL; +#line 2484 "DataSource.c" + SourceCollection* _tmp12_; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = self->priv->unlinked_from_collection; #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_collection_notify_unlinked_destroyed (_tmp12_, self); -#line 2471 "DataSource.c" +#line 2490 "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 2477 "DataSource.c" +#line 2496 "DataSource.c" } -static void _vala_array_add63 (DataView*** array, int* length, int* size, DataView* value) { +static void _vala_array_add63 (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 2488 "DataSource.c" +#line 2507 "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 2494 "DataSource.c" +#line 2513 "DataSource.c" } void data_source_internal_subscribe (DataSource* self, DataView* view) { - gboolean _tmp0_ = FALSE; - DataView** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - DataView* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; + gboolean _tmp0_; + DataView** _tmp13_; + gint _tmp13__length1; + DataView* _tmp14_; + DataView* _tmp15_; #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" @@ -2509,35 +2528,35 @@ 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 2512 "DataSource.c" +#line 2531 "DataSource.c" { gint ctr = 0; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2517 "DataSource.c" +#line 2536 "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 2524 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2543 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2534 "DataSource.c" - gint _tmp2_ = 0; +#line 2553 "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 2540 "DataSource.c" +#line 2559 "DataSource.c" } #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2551,7 +2570,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 2554 "DataSource.c" +#line 2573 "DataSource.c" } #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2563,13 +2582,13 @@ 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 2566 "DataSource.c" - DataView** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - DataView* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - DataView* _tmp12_ = NULL; +#line 2585 "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" @@ -2588,7 +2607,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp12_ = _tmp8_[_tmp9_]; #line 402 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2591 "DataSource.c" +#line 2610 "DataSource.c" } } } @@ -2603,12 +2622,12 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { _tmp15_ = _g_object_ref0 (_tmp14_); #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" _vala_array_add63 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_); -#line 2606 "DataSource.c" +#line 2625 "DataSource.c" } void data_source_internal_unsubscribe (DataSource* self, DataView* view) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 411 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2617,36 +2636,36 @@ 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 2620 "DataSource.c" +#line 2639 "DataSource.c" { gint ctr = 0; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2625 "DataSource.c" +#line 2644 "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 2632 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; - DataView* _tmp8_ = NULL; +#line 2651 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; + DataView* _tmp8_; #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2643 "DataSource.c" - gint _tmp2_ = 0; +#line 2662 "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 2649 "DataSource.c" +#line 2668 "DataSource.c" } #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2660,7 +2679,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 2663 "DataSource.c" +#line 2682 "DataSource.c" } #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2674,11 +2693,11 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { _tmp8_ = view; #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp7_ == _tmp8_) { -#line 2677 "DataSource.c" - DataView** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gint _tmp10_ = 0; - DataView* _tmp11_ = NULL; +#line 2696 "DataSource.c" + DataView** _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + DataView* _tmp11_; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp9_ = self->priv->subscribers; #line 416 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2693,7 +2712,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { _tmp11_ = _tmp9_[_tmp10_]; #line 418 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 2696 "DataSource.c" +#line 2715 "DataSource.c" } } } @@ -2702,7 +2721,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) { void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 423 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 424 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2711,35 +2730,35 @@ 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 2714 "DataSource.c" +#line 2733 "DataSource.c" { gint ctr = 0; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2719 "DataSource.c" +#line 2738 "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 2726 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2745 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2736 "DataSource.c" - gint _tmp2_ = 0; +#line 2755 "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 2742 "DataSource.c" +#line 2761 "DataSource.c" } #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2753,7 +2772,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 2756 "DataSource.c" +#line 2775 "DataSource.c" } #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2765,13 +2784,13 @@ 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 2768 "DataSource.c" - DataSourceContactSubscriber _tmp8_ = NULL; - void* _tmp8__target = NULL; - DataView** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gint _tmp10_ = 0; - DataView* _tmp11_ = 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" @@ -2786,19 +2805,19 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri _tmp11_ = _tmp9_[_tmp10_]; #line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp8_ (_tmp11_, _tmp8__target); -#line 2789 "DataSource.c" +#line 2808 "DataSource.c" } } } } #line 431 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2796 "DataSource.c" +#line 2815 "DataSource.c" } void data_source_contact_subscribers_alteration (DataSource* self, Alteration* alteration) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_DATA_SOURCE (self)); #line 434 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2809,35 +2828,35 @@ 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 2812 "DataSource.c" +#line 2831 "DataSource.c" { gint ctr = 0; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" ctr = 0; -#line 2817 "DataSource.c" +#line 2836 "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 2824 "DataSource.c" - gint _tmp3_ = 0; - DataView** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - DataView** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; - DataView* _tmp7_ = NULL; +#line 2843 "DataSource.c" + gint _tmp3_; + DataView** _tmp4_; + gint _tmp4__length1; + DataView** _tmp5_; + gint _tmp5__length1; + gint _tmp6_; + DataView* _tmp7_; #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp1_) { -#line 2834 "DataSource.c" - gint _tmp2_ = 0; +#line 2853 "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 2840 "DataSource.c" +#line 2859 "DataSource.c" } #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; @@ -2851,7 +2870,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 2854 "DataSource.c" +#line 2873 "DataSource.c" } #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->subscribers; @@ -2863,12 +2882,12 @@ 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 2866 "DataSource.c" - DataView** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - DataView* _tmp10_ = NULL; - Alteration* _tmp11_ = NULL; +#line 2885 "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" @@ -2881,21 +2900,21 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a _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 2884 "DataSource.c" +#line 2903 "DataSource.c" } } } } #line 442 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->in_contact = FALSE; -#line 2891 "DataSource.c" +#line 2910 "DataSource.c" } 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 2898 "DataSource.c" +#line 2917 "DataSource.c" } @@ -2914,26 +2933,26 @@ 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 2917 "DataSource.c" +#line 2936 "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 2923 "DataSource.c" +#line 2942 "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 2929 "DataSource.c" +#line 2948 "DataSource.c" } 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 2936 "DataSource.c" +#line 2955 "DataSource.c" } @@ -2947,35 +2966,35 @@ static void data_source_class_init (DataSourceClass * klass) { #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (DataSourcePrivate)); #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_source_real_notify_membership_changed; + ((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) data_source_real_notify_membership_changed; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_held_in_tank = (void (*)(DataSource*, SourceHoldingTank*)) data_source_real_notify_held_in_tank; + ((DataSourceClass *) klass)->notify_held_in_tank = (void (*) (DataSource *, SourceHoldingTank*)) data_source_real_notify_held_in_tank; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_source_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) data_source_real_notify_altered; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_unlinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_unlinking; + ((DataSourceClass *) klass)->notify_unlinking = (void (*) (DataSource *, SourceCollection*)) data_source_real_notify_unlinking; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_unlinked = (void (*)(DataSource*)) data_source_real_notify_unlinked; + ((DataSourceClass *) klass)->notify_unlinked = (void (*) (DataSource *)) data_source_real_notify_unlinked; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_relinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_relinking; + ((DataSourceClass *) klass)->notify_relinking = (void (*) (DataSource *, SourceCollection*)) data_source_real_notify_relinking; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->notify_relinked = (void (*)(DataSource*)) data_source_real_notify_relinked; + ((DataSourceClass *) klass)->notify_relinked = (void (*) (DataSource *)) data_source_real_notify_relinked; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) data_source_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) data_source_real_get_typename; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) data_source_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) data_source_real_get_instance_id; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->get_source_id = (gchar* (*)(DataSource*)) data_source_real_get_source_id; + ((DataSourceClass *) klass)->get_source_id = (gchar* (*) (DataSource *)) data_source_real_get_source_id; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) data_source_real_commit_backlinks; + ((DataSourceClass *) klass)->commit_backlinks = (void (*) (DataSource *, SourceCollection*, const gchar*)) data_source_real_commit_backlinks; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) data_source_real_save_snapshot; + ((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*) (DataSource *)) data_source_real_save_snapshot; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) data_source_real_internal_delete_backing; + ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) data_source_real_internal_delete_backing; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) data_source_real_equals; + ((DataSourceClass *) klass)->equals = (gboolean (*) (DataSource *, DataSource*)) data_source_real_equals; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) data_source_real_destroy; + ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) data_source_real_destroy; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((DataSourceClass *) klass)->unlinked = data_source_real_unlinked; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2985,17 +3004,17 @@ static void data_source_class_init (DataSourceClass * klass) { #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" G_OBJECT_CLASS (klass)->finalize = data_source_finalize; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("unlinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, unlinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION); + data_source_signals[DATA_SOURCE_UNLINKED_SIGNAL] = g_signal_new ("unlinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, unlinked), 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" - 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); + 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" - 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 2993 "DataSource.c" + 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" } static void data_source_instance_init (DataSource * self) { - DataView** _tmp0_ = NULL; + DataView** _tmp0_; #line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv = DATA_SOURCE_GET_PRIVATE (self); #line 42 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3018,11 +3037,11 @@ 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 3021 "DataSource.c" +#line 3040 "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); @@ -3034,7 +3053,7 @@ 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 3037 "DataSource.c" +#line 3056 "DataSource.c" } @@ -3054,8 +3073,8 @@ 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_by_name (self, "broken"); -#line 3058 "DataSource.c" + g_signal_emit (self, source_snapshot_signals[SOURCE_SNAPSHOT_BROKEN_SIGNAL], 0); +#line 3077 "DataSource.c" } @@ -3064,13 +3083,13 @@ void source_snapshot_notify_broken (SourceSnapshot* self) { 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 3067 "DataSource.c" +#line 3086 "DataSource.c" } gboolean source_snapshot_is_broken (SourceSnapshot* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 460 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_SNAPSHOT (self), FALSE); #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3079,7 +3098,7 @@ gboolean source_snapshot_is_broken (SourceSnapshot* self) { result = _tmp0_; #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3082 "DataSource.c" +#line 3101 "DataSource.c" } @@ -3089,7 +3108,7 @@ SourceSnapshot* source_snapshot_construct (GType object_type) { self = (SourceSnapshot*) g_type_create_instance (object_type); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3092 "DataSource.c" +#line 3111 "DataSource.c" } @@ -3100,7 +3119,7 @@ static void source_snapshot_real_broken (SourceSnapshot* self) { 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 3103 "DataSource.c" +#line 3122 "DataSource.c" } @@ -3109,7 +3128,7 @@ static void value_source_snapshot_free_value (GValue* value) { 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 3112 "DataSource.c" +#line 3131 "DataSource.c" } } @@ -3119,11 +3138,11 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d 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 3122 "DataSource.c" +#line 3141 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3126 "DataSource.c" +#line 3145 "DataSource.c" } } @@ -3131,66 +3150,66 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d 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 3134 "DataSource.c" +#line 3153 "DataSource.c" } 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 3141 "DataSource.c" - SourceSnapshot* object; +#line 3160 "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 3148 "DataSource.c" +#line 3167 "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 3152 "DataSource.c" +#line 3171 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_snapshot_ref (object); -#line 3156 "DataSource.c" +#line 3175 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3160 "DataSource.c" +#line 3179 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3164 "DataSource.c" +#line 3183 "DataSource.c" } static gchar* value_source_snapshot_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SourceSnapshot** object_p; + 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 3175 "DataSource.c" +#line 3194 "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 3181 "DataSource.c" +#line 3200 "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 3185 "DataSource.c" +#line 3204 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_snapshot_ref (value->data[0].v_pointer); -#line 3189 "DataSource.c" +#line 3208 "DataSource.c" } #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3193 "DataSource.c" +#line 3212 "DataSource.c" } @@ -3204,7 +3223,7 @@ 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 3207 "DataSource.c" +#line 3226 "DataSource.c" } @@ -3213,12 +3232,12 @@ gpointer value_get_source_snapshot (const GValue* value) { 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 3216 "DataSource.c" +#line 3235 "DataSource.c" } void value_set_source_snapshot (GValue* value, gpointer v_object) { - SourceSnapshot* old; + 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)); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3233,23 +3252,23 @@ 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 3236 "DataSource.c" +#line 3255 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3240 "DataSource.c" +#line 3259 "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 3246 "DataSource.c" +#line 3265 "DataSource.c" } } void value_take_source_snapshot (GValue* value, gpointer v_object) { - SourceSnapshot* old; + 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)); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3262,17 +3281,17 @@ 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 3265 "DataSource.c" +#line 3284 "DataSource.c" } else { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3269 "DataSource.c" +#line 3288 "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 3275 "DataSource.c" +#line 3294 "DataSource.c" } } @@ -3285,12 +3304,12 @@ static void source_snapshot_class_init (SourceSnapshotClass * klass) { #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (SourceSnapshotPrivate)); #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) source_snapshot_real_notify_broken; + ((SourceSnapshotClass *) klass)->notify_broken = (void (*) (SourceSnapshot *)) source_snapshot_real_notify_broken; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceSnapshotClass *) klass)->broken = source_snapshot_real_broken; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" - 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 3293 "DataSource.c" + 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" } @@ -3301,17 +3320,17 @@ static void source_snapshot_instance_init (SourceSnapshot * self) { self->priv->snapshot_broken = FALSE; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3304 "DataSource.c" +#line 3323 "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 3314 "DataSource.c" +#line 3333 "DataSource.c" } @@ -3330,18 +3349,18 @@ GType source_snapshot_get_type (void) { gpointer source_snapshot_ref (gpointer instance) { - SourceSnapshot* self; + 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 3339 "DataSource.c" +#line 3358 "DataSource.c" } void source_snapshot_unref (gpointer instance) { - SourceSnapshot* self; + SourceSnapshot * self; self = instance; #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3349,7 +3368,7 @@ 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 3352 "DataSource.c" +#line 3371 "DataSource.c" } } @@ -3357,35 +3376,35 @@ void source_snapshot_unref (gpointer instance) { static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3376 "DataSource.c" +#line 3395 "DataSource.c" } SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, const gchar* value) { SourceBacklink* self = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; #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" @@ -3418,31 +3437,31 @@ SourceBacklink* source_backlink_construct (GType object_type, const gchar* name, self->priv->_value = _tmp6_; #line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3421 "DataSource.c" +#line 3440 "DataSource.c" } 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 3428 "DataSource.c" +#line 3447 "DataSource.c" } SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source) { SourceBacklink* self = NULL; - DataSource* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; - gint64 _tmp5_ = 0LL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + DataSource* _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_; #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" @@ -3487,34 +3506,34 @@ SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSo _vala_assert (_tmp11_, "validate_name_value(_name, _value)"); #line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 3490 "DataSource.c" +#line 3509 "DataSource.c" } 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 3497 "DataSource.c" +#line 3516 "DataSource.c" } static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3517 "DataSource.c" +#line 3536 "DataSource.c" } @@ -3522,8 +3541,8 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = 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" @@ -3534,53 +3553,53 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc _tmp3_ = string_contains (_tmp2_, "="); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (!_tmp3_) { -#line 3537 "DataSource.c" - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#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_, "|"); #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = !_tmp5_; -#line 3546 "DataSource.c" +#line 3565 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = FALSE; -#line 3550 "DataSource.c" +#line 3569 "DataSource.c" } #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp1_) { -#line 3554 "DataSource.c" - const gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#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 3563 "DataSource.c" +#line 3582 "DataSource.c" } else { #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3567 "DataSource.c" +#line 3586 "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 3573 "DataSource.c" +#line 3592 "DataSource.c" } gchar* source_backlink_to_string (SourceBacklink* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; #line 516 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3597,20 +3616,20 @@ gchar* source_backlink_to_string (SourceBacklink* self) { result = _tmp4_; #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3600 "DataSource.c" +#line 3619 "DataSource.c" } guint source_backlink_hash_func (SourceBacklink* backlink) { guint result = 0U; - GHashFunc _tmp0_ = NULL; - SourceBacklink* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GHashFunc _tmp4_ = NULL; - SourceBacklink* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - guint _tmp7_ = 0U; + GHashFunc _tmp0_; + SourceBacklink* _tmp1_; + const gchar* _tmp2_; + guint _tmp3_; + GHashFunc _tmp4_; + SourceBacklink* _tmp5_; + const gchar* _tmp6_; + guint _tmp7_; #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" @@ -3633,19 +3652,19 @@ guint source_backlink_hash_func (SourceBacklink* backlink) { result = _tmp3_ ^ _tmp7_; #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3636 "DataSource.c" +#line 3655 "DataSource.c" } gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blink) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GEqualFunc _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SourceBacklink* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GEqualFunc _tmp1_; + SourceBacklink* _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" @@ -3664,13 +3683,13 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin _tmp6_ = _tmp1_ (_tmp3_, _tmp5_); #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp6_) { -#line 3667 "DataSource.c" - GEqualFunc _tmp7_ = NULL; - SourceBacklink* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - SourceBacklink* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#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" @@ -3685,23 +3704,23 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin _tmp12_ = _tmp7_ (_tmp9_, _tmp11_); #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = _tmp12_; -#line 3688 "DataSource.c" +#line 3707 "DataSource.c" } else { #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp0_ = FALSE; -#line 3692 "DataSource.c" +#line 3711 "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 3698 "DataSource.c" +#line 3717 "DataSource.c" } const gchar* source_backlink_get_name (SourceBacklink* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 473 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3710,13 +3729,13 @@ const gchar* source_backlink_get_name (SourceBacklink* self) { result = _tmp0_; #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3713 "DataSource.c" +#line 3732 "DataSource.c" } const gchar* source_backlink_get_value (SourceBacklink* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 479 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3725,13 +3744,13 @@ const gchar* source_backlink_get_value (SourceBacklink* self) { result = _tmp0_; #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3728 "DataSource.c" +#line 3747 "DataSource.c" } const gchar* source_backlink_get_typename (SourceBacklink* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 486 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (self), NULL); #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3740,32 +3759,32 @@ const gchar* source_backlink_get_typename (SourceBacklink* self) { result = _tmp0_; #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3743 "DataSource.c" +#line 3762 "DataSource.c" } static gint64 int64_parse (const gchar* str) { gint64 result = 0LL; - const gchar* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gint64 _tmp1_; +#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3761 "DataSource.c" +#line 3780 "DataSource.c" } gint64 source_backlink_get_instance_id (SourceBacklink* self) { gint64 result; - const gchar* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; + 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" @@ -3776,14 +3795,14 @@ gint64 source_backlink_get_instance_id (SourceBacklink* self) { result = _tmp1_; #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 3779 "DataSource.c" +#line 3798 "DataSource.c" } 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 3786 "DataSource.c" +#line 3805 "DataSource.c" } @@ -3792,7 +3811,7 @@ static void value_source_backlink_free_value (GValue* value) { 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 3795 "DataSource.c" +#line 3814 "DataSource.c" } } @@ -3802,11 +3821,11 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d 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 3805 "DataSource.c" +#line 3824 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 3809 "DataSource.c" +#line 3828 "DataSource.c" } } @@ -3814,66 +3833,66 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d 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 3817 "DataSource.c" +#line 3836 "DataSource.c" } 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 3824 "DataSource.c" - SourceBacklink* object; +#line 3843 "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 3831 "DataSource.c" +#line 3850 "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 3835 "DataSource.c" +#line 3854 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_backlink_ref (object); -#line 3839 "DataSource.c" +#line 3858 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3843 "DataSource.c" +#line 3862 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3847 "DataSource.c" +#line 3866 "DataSource.c" } static gchar* value_source_backlink_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SourceBacklink** object_p; + 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 3858 "DataSource.c" +#line 3877 "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 3864 "DataSource.c" +#line 3883 "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 3868 "DataSource.c" +#line 3887 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_backlink_ref (value->data[0].v_pointer); -#line 3872 "DataSource.c" +#line 3891 "DataSource.c" } #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 3876 "DataSource.c" +#line 3895 "DataSource.c" } @@ -3887,7 +3906,7 @@ 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 3890 "DataSource.c" +#line 3909 "DataSource.c" } @@ -3896,12 +3915,12 @@ gpointer value_get_source_backlink (const GValue* value) { 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 3899 "DataSource.c" +#line 3918 "DataSource.c" } void value_set_source_backlink (GValue* value, gpointer v_object) { - SourceBacklink* old; + 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)); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3916,23 +3935,23 @@ 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 3919 "DataSource.c" +#line 3938 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3923 "DataSource.c" +#line 3942 "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 3929 "DataSource.c" +#line 3948 "DataSource.c" } } void value_take_source_backlink (GValue* value, gpointer v_object) { - SourceBacklink* old; + 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)); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3945,17 +3964,17 @@ 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 3948 "DataSource.c" +#line 3967 "DataSource.c" } else { #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 3952 "DataSource.c" +#line 3971 "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 3958 "DataSource.c" +#line 3977 "DataSource.c" } } @@ -3967,7 +3986,7 @@ static void source_backlink_class_init (SourceBacklinkClass * klass) { ((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 3970 "DataSource.c" +#line 3989 "DataSource.c" } @@ -3976,11 +3995,11 @@ static void source_backlink_instance_init (SourceBacklink * self) { self->priv = SOURCE_BACKLINK_GET_PRIVATE (self); #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 3979 "DataSource.c" +#line 3998 "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); @@ -3990,7 +4009,7 @@ 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 3993 "DataSource.c" +#line 4012 "DataSource.c" } @@ -4009,18 +4028,18 @@ GType source_backlink_get_type (void) { gpointer source_backlink_ref (gpointer instance) { - SourceBacklink* self; + 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 4018 "DataSource.c" +#line 4037 "DataSource.c" } void source_backlink_unref (gpointer instance) { - SourceBacklink* self; + SourceBacklink * self; self = instance; #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -4028,7 +4047,7 @@ 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 4031 "DataSource.c" +#line 4050 "DataSource.c" } } @@ -4036,32 +4055,32 @@ void source_backlink_unref (gpointer instance) { 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 4039 "DataSource.c" +#line 4058 "DataSource.c" } 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 4046 "DataSource.c" +#line 4065 "DataSource.c" } SourceProxy* source_proxy_construct (GType object_type, DataSource* source) { SourceProxy* self = NULL; - DataSource* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - DataSource* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; - SourceSnapshot* _tmp5_ = NULL; - SourceSnapshot* _tmp6_ = NULL; - SourceSnapshot* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - DataCollection* _tmp10_ = NULL; - SourceCollection* _tmp11_ = NULL; - SourceCollection* _tmp12_ = 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_; #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" @@ -4118,7 +4137,7 @@ SourceProxy* source_proxy_construct (GType object_type, DataSource* source) { 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); #line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala" return self; -#line 4121 "DataSource.c" +#line 4140 "DataSource.c" } @@ -4127,7 +4146,7 @@ static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 obj 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 4130 "DataSource.c" +#line 4149 "DataSource.c" } @@ -4136,19 +4155,19 @@ DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, Sour 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 4139 "DataSource.c" +#line 4158 "DataSource.c" } static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSource* source) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #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_by_name (self, "reconstituted", _tmp0_); -#line 4151 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL], 0, _tmp0_); +#line 4170 "DataSource.c" } @@ -4157,14 +4176,14 @@ void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source) { 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 4160 "DataSource.c" +#line 4179 "DataSource.c" } static void source_proxy_real_notify_dehydrated (SourceProxy* self) { #line 598 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "dehydrated"); -#line 4167 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_DEHYDRATED_SIGNAL], 0); +#line 4186 "DataSource.c" } @@ -4173,14 +4192,14 @@ void source_proxy_notify_dehydrated (SourceProxy* self) { 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 4176 "DataSource.c" +#line 4195 "DataSource.c" } static void source_proxy_real_notify_broken (SourceProxy* self) { #line 602 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_emit_by_name (self, "broken"); -#line 4183 "DataSource.c" + g_signal_emit (self, source_proxy_signals[SOURCE_PROXY_BROKEN_SIGNAL], 0); +#line 4202 "DataSource.c" } @@ -4189,7 +4208,7 @@ void source_proxy_notify_broken (SourceProxy* self) { 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 4192 "DataSource.c" +#line 4211 "DataSource.c" } @@ -4200,21 +4219,21 @@ static void source_proxy_on_snapshot_broken (SourceProxy* self) { source_proxy_drop_source (self); #line 608 "/home/jens/Source/shotwell/src/core/DataSource.vala" source_proxy_notify_broken (self); -#line 4203 "DataSource.c" +#line 4222 "DataSource.c" } 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 4210 "DataSource.c" +#line 4229 "DataSource.c" } static void source_proxy_set_source (SourceProxy* self, DataSource* source) { - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - DataSource* _tmp2_ = NULL; + 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" @@ -4233,14 +4252,14 @@ static void source_proxy_set_source (SourceProxy* self, DataSource* source) { _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 4236 "DataSource.c" +#line 4255 "DataSource.c" } static void source_proxy_drop_source (SourceProxy* self) { - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - guint _tmp2_ = 0U; + DataSource* _tmp0_; + DataSource* _tmp1_; + guint _tmp2_; #line 618 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 619 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4249,7 +4268,7 @@ static void source_proxy_drop_source (SourceProxy* self) { if (_tmp0_ == NULL) { #line 620 "/home/jens/Source/shotwell/src/core/DataSource.vala" return; -#line 4252 "DataSource.c" +#line 4271 "DataSource.c" } #line 622 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = self->priv->source; @@ -4261,32 +4280,32 @@ 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 4264 "DataSource.c" +#line 4283 "DataSource.c" } DataSource* source_proxy_get_source (SourceProxy* self) { DataSource* result = NULL; - SourceSnapshot* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - DataSource* _tmp2_ = NULL; + SourceSnapshot* _tmp0_; + gboolean _tmp1_; + DataSource* _tmp2_; DataSource* new_source = NULL; - gint64 _tmp5_ = 0LL; - SourceSnapshot* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - gint64 _tmp12_ = 0LL; - DataSource* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; - DataSource* _tmp17_ = NULL; - gint64 _tmp18_ = 0LL; - gint64 _tmp19_ = 0LL; - SourceCollection* _tmp20_ = NULL; - DataSource* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - DataSource* _tmp23_ = NULL; - DataSource* _tmp24_ = NULL; + gint64 _tmp5_; + SourceSnapshot* _tmp6_; + DataSource* _tmp7_; + DataSource* _tmp8_; + DataSource* _tmp9_; + gint64 _tmp12_; + DataSource* _tmp13_; + gint64 _tmp14_; + DataSource* _tmp17_; + gint64 _tmp18_; + gint64 _tmp19_; + SourceCollection* _tmp20_; + DataSource* _tmp21_; + gboolean _tmp22_; + DataSource* _tmp23_; + DataSource* _tmp24_; #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" @@ -4299,15 +4318,15 @@ DataSource* source_proxy_get_source (SourceProxy* self) { result = NULL; #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4302 "DataSource.c" +#line 4321 "DataSource.c" } #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp2_ = self->priv->source; #line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp2_ != NULL) { -#line 4308 "DataSource.c" - DataSource* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; +#line 4327 "DataSource.c" + DataSource* _tmp3_; + DataSource* _tmp4_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = self->priv->source; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4316,7 +4335,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) { result = _tmp4_; #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4319 "DataSource.c" +#line 4338 "DataSource.c" } #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = self->priv->object_id; @@ -4332,9 +4351,9 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _tmp9_ = new_source; #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp8_ != _tmp9_) { -#line 4335 "DataSource.c" - DataSource* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; +#line 4354 "DataSource.c" + DataSource* _tmp10_; + DataSource* _tmp11_; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = new_source; #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4343,7 +4362,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _g_object_unref0 (self->priv->source); #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->priv->source = _tmp11_; -#line 4346 "DataSource.c" +#line 4365 "DataSource.c" } #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp12_ = self->priv->object_id; @@ -4353,16 +4372,16 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _tmp14_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject)); #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (_tmp12_ != _tmp14_) { -#line 4356 "DataSource.c" - DataSource* _tmp15_ = NULL; - gint64 _tmp16_ = 0LL; +#line 4375 "DataSource.c" + DataSource* _tmp15_; + gint64 _tmp16_; #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp15_ = 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 4365 "DataSource.c" +#line 4384 "DataSource.c" } #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp17_ = self->priv->source; @@ -4390,12 +4409,12 @@ DataSource* source_proxy_get_source (SourceProxy* self) { _g_object_unref0 (new_source); #line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala" return result; -#line 4393 "DataSource.c" +#line 4412 "DataSource.c" } static void source_proxy_on_destroyed (SourceProxy* self) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 647 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 648 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4406,12 +4425,12 @@ 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 4409 "DataSource.c" +#line 4428 "DataSource.c" } static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_return_if_fail (IS_SOURCE_PROXY (self)); #line 656 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4422,12 +4441,12 @@ 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 4425 "DataSource.c" +#line 4444 "DataSource.c" } { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp1_ = added; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4436,17 +4455,17 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) _object_it = _tmp2_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" while (TRUE) { -#line 4439 "DataSource.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 4458 "DataSource.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; - gint64 _tmp8_ = 0LL; - gint64 _tmp9_ = 0LL; - DataObject* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataObject* _tmp7_; + gint64 _tmp8_; + gint64 _tmp9_; + DataObject* _tmp10_; + DataObject* _tmp11_; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp3_ = _object_it; #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4455,7 +4474,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) if (!_tmp4_) { #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4458 "DataSource.c" +#line 4477 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp5_ = _object_it; @@ -4475,7 +4494,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) _g_object_unref0 (object); #line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala" continue; -#line 4478 "DataSource.c" +#line 4497 "DataSource.c" } #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala" _tmp10_ = object; @@ -4489,11 +4508,11 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) _g_object_unref0 (object); #line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala" break; -#line 4492 "DataSource.c" +#line 4511 "DataSource.c" } #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala" _g_object_unref0 (_object_it); -#line 4496 "DataSource.c" +#line 4515 "DataSource.c" } } @@ -4501,7 +4520,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added) 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 4504 "DataSource.c" +#line 4523 "DataSource.c" } @@ -4516,7 +4535,7 @@ static void source_proxy_real_broken (SourceProxy* self) { 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 4519 "DataSource.c" +#line 4538 "DataSource.c" } @@ -4525,7 +4544,7 @@ static void value_source_proxy_free_value (GValue* value) { 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 4528 "DataSource.c" +#line 4547 "DataSource.c" } } @@ -4535,11 +4554,11 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest 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 4538 "DataSource.c" +#line 4557 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" dest_value->data[0].v_pointer = NULL; -#line 4542 "DataSource.c" +#line 4561 "DataSource.c" } } @@ -4547,66 +4566,66 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest 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 4550 "DataSource.c" +#line 4569 "DataSource.c" } 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 4557 "DataSource.c" - SourceProxy* object; +#line 4576 "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 4564 "DataSource.c" +#line 4583 "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 4568 "DataSource.c" +#line 4587 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = source_proxy_ref (object); -#line 4572 "DataSource.c" +#line 4591 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4576 "DataSource.c" +#line 4595 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4580 "DataSource.c" +#line 4599 "DataSource.c" } static gchar* value_source_proxy_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SourceProxy** object_p; + 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 4591 "DataSource.c" +#line 4610 "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 4597 "DataSource.c" +#line 4616 "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 4601 "DataSource.c" +#line 4620 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" *object_p = source_proxy_ref (value->data[0].v_pointer); -#line 4605 "DataSource.c" +#line 4624 "DataSource.c" } #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" return NULL; -#line 4609 "DataSource.c" +#line 4628 "DataSource.c" } @@ -4620,7 +4639,7 @@ 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 4623 "DataSource.c" +#line 4642 "DataSource.c" } @@ -4629,12 +4648,12 @@ gpointer value_get_source_proxy (const GValue* value) { 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 4632 "DataSource.c" +#line 4651 "DataSource.c" } void value_set_source_proxy (GValue* value, gpointer v_object) { - SourceProxy* old; + 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)); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4649,23 +4668,23 @@ 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 4652 "DataSource.c" +#line 4671 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4656 "DataSource.c" +#line 4675 "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 4662 "DataSource.c" +#line 4681 "DataSource.c" } } void value_take_source_proxy (GValue* value, gpointer v_object) { - SourceProxy* old; + 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)); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4678,17 +4697,17 @@ 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 4681 "DataSource.c" +#line 4700 "DataSource.c" } else { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" value->data[0].v_pointer = NULL; -#line 4685 "DataSource.c" +#line 4704 "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 4691 "DataSource.c" +#line 4710 "DataSource.c" } } @@ -4701,13 +4720,13 @@ static void source_proxy_class_init (SourceProxyClass * klass) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" g_type_class_add_private (klass, sizeof (SourceProxyPrivate)); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) source_proxy_real_reconstitute; + ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) source_proxy_real_reconstitute; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->notify_reconstituted = (void (*)(SourceProxy*, DataSource*)) source_proxy_real_notify_reconstituted; + ((SourceProxyClass *) klass)->notify_reconstituted = (void (*) (SourceProxy *, DataSource*)) source_proxy_real_notify_reconstituted; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->notify_dehydrated = (void (*)(SourceProxy*)) source_proxy_real_notify_dehydrated; + ((SourceProxyClass *) klass)->notify_dehydrated = (void (*) (SourceProxy *)) source_proxy_real_notify_dehydrated; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - ((SourceProxyClass *) klass)->notify_broken = (void (*)(SourceProxy*)) source_proxy_real_notify_broken; + ((SourceProxyClass *) klass)->notify_broken = (void (*) (SourceProxy *)) source_proxy_real_notify_broken; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceProxyClass *) klass)->reconstituted = source_proxy_real_reconstituted; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4715,12 +4734,12 @@ static void source_proxy_class_init (SourceProxyClass * klass) { #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" ((SourceProxyClass *) klass)->broken = source_proxy_real_broken; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - g_signal_new ("reconstituted", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, reconstituted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); + source_proxy_signals[SOURCE_PROXY_RECONSTITUTED_SIGNAL] = g_signal_new ("reconstituted", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, reconstituted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" - 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); + 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" - 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 4723 "DataSource.c" + 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" } @@ -4729,14 +4748,14 @@ static void source_proxy_instance_init (SourceProxy * self) { self->priv = SOURCE_PROXY_GET_PRIVATE (self); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self->ref_count = 1; -#line 4732 "DataSource.c" +#line 4751 "DataSource.c" } -static void source_proxy_finalize (SourceProxy* obj) { +static void source_proxy_finalize (SourceProxy * obj) { SourceProxy * self; - SourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; + SourceCollection* _tmp0_; + guint _tmp1_; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_PROXY, SourceProxy); #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -4757,7 +4776,7 @@ 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 4760 "DataSource.c" +#line 4779 "DataSource.c" } @@ -4776,18 +4795,18 @@ GType source_proxy_get_type (void) { gpointer source_proxy_ref (gpointer instance) { - SourceProxy* self; + 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 4785 "DataSource.c" +#line 4804 "DataSource.c" } void source_proxy_unref (gpointer instance) { - SourceProxy* self; + SourceProxy * self; self = instance; #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -4795,7 +4814,7 @@ 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 4798 "DataSource.c" +#line 4817 "DataSource.c" } } @@ -4805,7 +4824,7 @@ SourceProxy* proxyable_get_proxy (Proxyable* self) { 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 4808 "DataSource.c" +#line 4827 "DataSource.c" } @@ -4816,7 +4835,7 @@ static void proxyable_base_init (ProxyableIface * iface) { if (!initialized) { #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala" initialized = TRUE; -#line 4819 "DataSource.c" +#line 4838 "DataSource.c" } } diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c index a71a3c3..539ab93 100644 --- a/src/core/DataSourceTypes.c +++ b/src/core/DataSourceTypes.c @@ -1,4 +1,4 @@ -/* DataSourceTypes.c generated by valac 0.34.7, the Vala compiler +/* DataSourceTypes.c generated by valac 0.36.6, the Vala compiler * generated from DataSourceTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -124,6 +124,11 @@ typedef struct _DataViewClass DataViewClass; typedef struct _ThumbnailView ThumbnailView; typedef struct _ThumbnailViewClass ThumbnailViewClass; +enum { + THUMBNAIL_SOURCE_THUMBNAIL_ALTERED_SIGNAL, + THUMBNAIL_SOURCE_LAST_SIGNAL +}; +static guint thumbnail_source_signals[THUMBNAIL_SOURCE_LAST_SIGNAL] = {0}; #define TYPE_INDEXABLE (indexable_get_type ()) #define INDEXABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INDEXABLE, Indexable)) @@ -593,30 +598,30 @@ void container_source_establish_link_many (ContainerSource* self, GeeCollection* ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id) { ThumbnailSource * self = NULL; - gint64 _tmp0_ = 0LL; + 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_); #line 15 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 604 "DataSourceTypes.c" +#line 609 "DataSourceTypes.c" } 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 611 "DataSourceTypes.c" +#line 616 "DataSourceTypes.c" } static void thumbnail_source_real_notify_thumbnail_altered (ThumbnailSource* self) { #line 21 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - g_signal_emit_by_name (self, "thumbnail-altered"); + 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 620 "DataSourceTypes.c" +#line 625 "DataSourceTypes.c" } @@ -625,12 +630,12 @@ void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self) { 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 629 "DataSourceTypes.c" +#line 634 "DataSourceTypes.c" } static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self, DataView* view) { - DataView* _tmp0_ = NULL; + DataView* _tmp0_; #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" @@ -639,7 +644,7 @@ static void thumbnail_source_subscriber_thumbnail_altered (ThumbnailSource* self _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 643 "DataSourceTypes.c" +#line 648 "DataSourceTypes.c" } @@ -648,7 +653,7 @@ static GdkPixbuf* thumbnail_source_real_get_thumbnail (ThumbnailSource* self, gi 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 652 "DataSourceTypes.c" +#line 657 "DataSourceTypes.c" } @@ -657,7 +662,7 @@ GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GE 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 661 "DataSourceTypes.c" +#line 666 "DataSourceTypes.c" } @@ -666,7 +671,7 @@ static GdkPixbuf* thumbnail_source_real_create_thumbnail (ThumbnailSource* self, 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 670 "DataSourceTypes.c" +#line 675 "DataSourceTypes.c" } @@ -675,20 +680,20 @@ GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, 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 679 "DataSourceTypes.c" +#line 684 "DataSourceTypes.c" } static gchar* thumbnail_source_real_get_representative_id (ThumbnailSource* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" _tmp0_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource)); #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" result = _tmp0_; #line 47 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return result; -#line 692 "DataSourceTypes.c" +#line 697 "DataSourceTypes.c" } @@ -697,7 +702,7 @@ gchar* thumbnail_source_get_representative_id (ThumbnailSource* self) { 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 701 "DataSourceTypes.c" +#line 706 "DataSourceTypes.c" } @@ -706,7 +711,7 @@ static PhotoFileFormat thumbnail_source_real_get_preferred_thumbnail_format (Thu 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 710 "DataSourceTypes.c" +#line 715 "DataSourceTypes.c" } @@ -715,7 +720,7 @@ PhotoFileFormat thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource 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 719 "DataSourceTypes.c" +#line 724 "DataSourceTypes.c" } @@ -727,20 +732,20 @@ 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" - ((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = (void (*)(ThumbnailSource*)) thumbnail_source_real_notify_thumbnail_altered; + ((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = (void (*) (ThumbnailSource *)) thumbnail_source_real_notify_thumbnail_altered; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_get_thumbnail; + ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) thumbnail_source_real_get_thumbnail; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_create_thumbnail; + ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) thumbnail_source_real_create_thumbnail; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*)(ThumbnailSource*)) thumbnail_source_real_get_representative_id; + ((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*) (ThumbnailSource *)) thumbnail_source_real_get_representative_id; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) thumbnail_source_real_get_preferred_thumbnail_format; + ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) thumbnail_source_real_get_preferred_thumbnail_format; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((ThumbnailSourceClass *) klass)->thumbnail_altered = thumbnail_source_real_thumbnail_altered; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - 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 744 "DataSourceTypes.c" + 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" } @@ -762,14 +767,14 @@ GType thumbnail_source_get_type (void) { PhotoSource* photo_source_construct (GType object_type, gint64 object_id) { PhotoSource * self = NULL; - gint64 _tmp0_ = 0LL; + 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_); #line 54 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 773 "DataSourceTypes.c" +#line 778 "DataSourceTypes.c" } @@ -778,7 +783,7 @@ static PhotoMetadata* photo_source_real_get_metadata (PhotoSource* self) { 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 782 "DataSourceTypes.c" +#line 787 "DataSourceTypes.c" } @@ -787,7 +792,7 @@ PhotoMetadata* photo_source_get_metadata (PhotoSource* self) { 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 791 "DataSourceTypes.c" +#line 796 "DataSourceTypes.c" } @@ -796,7 +801,7 @@ static GdkPixbuf* photo_source_real_get_pixbuf (PhotoSource* self, Scaling* scal 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 800 "DataSourceTypes.c" +#line 805 "DataSourceTypes.c" } @@ -805,7 +810,7 @@ GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError* 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 809 "DataSourceTypes.c" +#line 814 "DataSourceTypes.c" } @@ -813,10 +818,10 @@ 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; + ((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 820 "DataSourceTypes.c" + ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) photo_source_real_get_pixbuf; +#line 825 "DataSourceTypes.c" } @@ -842,14 +847,14 @@ VideoSource* video_source_construct (GType object_type) { 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 846 "DataSourceTypes.c" +#line 851 "DataSourceTypes.c" } 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 853 "DataSourceTypes.c" +#line 858 "DataSourceTypes.c" } @@ -871,14 +876,14 @@ GType video_source_get_type (void) { EventSource* event_source_construct (GType object_type, gint64 object_id) { EventSource * self = NULL; - gint64 _tmp0_ = 0LL; + 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_); #line 71 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return self; -#line 882 "DataSourceTypes.c" +#line 887 "DataSourceTypes.c" } @@ -888,7 +893,7 @@ static time_t event_source_real_get_start_time (EventSource* self) { 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 892 "DataSourceTypes.c" +#line 897 "DataSourceTypes.c" } @@ -897,7 +902,7 @@ time_t event_source_get_start_time (EventSource* self) { 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 901 "DataSourceTypes.c" +#line 906 "DataSourceTypes.c" } @@ -907,7 +912,7 @@ static time_t event_source_real_get_end_time (EventSource* self) { 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 911 "DataSourceTypes.c" +#line 916 "DataSourceTypes.c" } @@ -916,7 +921,7 @@ time_t event_source_get_end_time (EventSource* self) { 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 920 "DataSourceTypes.c" +#line 925 "DataSourceTypes.c" } @@ -926,7 +931,7 @@ static guint64 event_source_real_get_total_filesize (EventSource* self) { 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 930 "DataSourceTypes.c" +#line 935 "DataSourceTypes.c" } @@ -935,7 +940,7 @@ guint64 event_source_get_total_filesize (EventSource* self) { 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 939 "DataSourceTypes.c" +#line 944 "DataSourceTypes.c" } @@ -945,7 +950,7 @@ static gint event_source_real_get_media_count (EventSource* self) { 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 949 "DataSourceTypes.c" +#line 954 "DataSourceTypes.c" } @@ -954,7 +959,7 @@ gint event_source_get_media_count (EventSource* self) { 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 958 "DataSourceTypes.c" +#line 963 "DataSourceTypes.c" } @@ -963,7 +968,7 @@ static GeeCollection* event_source_real_get_media (EventSource* self) { 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 967 "DataSourceTypes.c" +#line 972 "DataSourceTypes.c" } @@ -972,7 +977,7 @@ GeeCollection* event_source_get_media (EventSource* self) { 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 976 "DataSourceTypes.c" +#line 981 "DataSourceTypes.c" } @@ -981,7 +986,7 @@ static gchar* event_source_real_get_comment (EventSource* self) { 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 985 "DataSourceTypes.c" +#line 990 "DataSourceTypes.c" } @@ -990,7 +995,7 @@ gchar* event_source_get_comment (EventSource* self) { 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 994 "DataSourceTypes.c" +#line 999 "DataSourceTypes.c" } @@ -1000,7 +1005,7 @@ static gboolean event_source_real_set_comment (EventSource* self, const gchar* c 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 1004 "DataSourceTypes.c" +#line 1009 "DataSourceTypes.c" } @@ -1009,7 +1014,7 @@ gboolean event_source_set_comment (EventSource* self, const gchar* comment) { 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 1013 "DataSourceTypes.c" +#line 1018 "DataSourceTypes.c" } @@ -1017,20 +1022,20 @@ 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" - ((EventSourceClass *) klass)->get_start_time = (time_t (*)(EventSource*)) event_source_real_get_start_time; + ((EventSourceClass *) klass)->get_start_time = (time_t (*) (EventSource *)) event_source_real_get_start_time; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_end_time = (time_t (*)(EventSource*)) event_source_real_get_end_time; + ((EventSourceClass *) klass)->get_end_time = (time_t (*) (EventSource *)) event_source_real_get_end_time; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_total_filesize = (guint64 (*)(EventSource*)) event_source_real_get_total_filesize; + ((EventSourceClass *) klass)->get_total_filesize = (guint64 (*) (EventSource *)) event_source_real_get_total_filesize; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_media_count = (gint (*)(EventSource*)) event_source_real_get_media_count; + ((EventSourceClass *) klass)->get_media_count = (gint (*) (EventSource *)) event_source_real_get_media_count; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_media = (GeeCollection* (*)(EventSource*)) event_source_real_get_media; + ((EventSourceClass *) klass)->get_media = (GeeCollection* (*) (EventSource *)) event_source_real_get_media; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_comment = (gchar* (*)(EventSource*)) event_source_real_get_comment; + ((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 1034 "DataSourceTypes.c" + ((EventSourceClass *) klass)->set_comment = (gboolean (*) (EventSource *, const gchar*)) event_source_real_set_comment; +#line 1039 "DataSourceTypes.c" } @@ -1055,7 +1060,7 @@ gboolean container_source_has_links (ContainerSource* self) { 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 1059 "DataSourceTypes.c" +#line 1064 "DataSourceTypes.c" } @@ -1064,7 +1069,7 @@ SourceBacklink* container_source_get_backlink (ContainerSource* self) { 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 1068 "DataSourceTypes.c" +#line 1073 "DataSourceTypes.c" } @@ -1073,7 +1078,7 @@ void container_source_break_link (ContainerSource* self, DataSource* source) { 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 1077 "DataSourceTypes.c" +#line 1082 "DataSourceTypes.c" } @@ -1082,7 +1087,7 @@ void container_source_break_link_many (ContainerSource* self, GeeCollection* sou 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 1086 "DataSourceTypes.c" +#line 1091 "DataSourceTypes.c" } @@ -1091,7 +1096,7 @@ void container_source_establish_link (ContainerSource* self, DataSource* source) 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 1095 "DataSourceTypes.c" +#line 1100 "DataSourceTypes.c" } @@ -1100,7 +1105,7 @@ void container_source_establish_link_many (ContainerSource* self, GeeCollection* 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 1104 "DataSourceTypes.c" +#line 1109 "DataSourceTypes.c" } @@ -1111,7 +1116,7 @@ static void container_source_base_init (ContainerSourceIface * iface) { if (!initialized) { #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" initialized = TRUE; -#line 1115 "DataSourceTypes.c" +#line 1120 "DataSourceTypes.c" } } diff --git a/src/core/DataView.c b/src/core/DataView.c index b25fa1e..004d364 100644 --- a/src/core/DataView.c +++ b/src/core/DataView.c @@ -1,4 +1,4 @@ -/* DataView.c generated by valac 0.34.7, the Vala compiler +/* DataView.c generated by valac 0.36.6, the Vala compiler * generated from DataView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -77,6 +77,15 @@ typedef struct _DataSourceClass DataSourceClass; typedef struct _ViewCollection ViewCollection; typedef struct _ViewCollectionClass ViewCollectionClass; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) +enum { + DATA_VIEW_STATE_CHANGED_SIGNAL, + DATA_VIEW_VISIBILITY_CHANGED_SIGNAL, + DATA_VIEW_VIEW_ALTERED_SIGNAL, + DATA_VIEW_GEOMETRY_ALTERED_SIGNAL, + DATA_VIEW_UNSUBSCRIBED_SIGNAL, + DATA_VIEW_LAST_SIGNAL +}; +static guint data_view_signals[DATA_VIEW_LAST_SIGNAL] = {0}; struct _DataObject { GObject parent_instance; @@ -172,21 +181,21 @@ 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_finalize (GObject* obj); +static void data_view_finalize (GObject * obj); 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 182 "DataView.c" +#line 191 "DataView.c" } DataView* data_view_construct (GType object_type, DataSource* source) { DataView * self = NULL; - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - DataSource* _tmp2_ = 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" @@ -205,25 +214,25 @@ DataView* data_view_construct (GType object_type, DataSource* source) { data_source_internal_subscribe (_tmp2_, self); #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala" return self; -#line 209 "DataView.c" +#line 218 "DataView.c" } 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 216 "DataView.c" +#line 225 "DataView.c" } static gchar* data_view_real_get_name (DataObject* base) { DataView * self; gchar* result = NULL; - DataSource* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + DataSource* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 47 "/home/jens/Source/shotwell/src/core/DataView.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_VIEW, DataView); #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -242,20 +251,20 @@ static gchar* data_view_real_get_name (DataObject* base) { result = _tmp4_; #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 246 "DataView.c" +#line 255 "DataView.c" } static gchar* data_view_real_to_string (DataObject* base) { DataView * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - DataSource* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + DataSource* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 51 "/home/jens/Source/shotwell/src/core/DataView.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_VIEW, DataView); #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -280,14 +289,14 @@ static gchar* data_view_real_to_string (DataObject* base) { result = _tmp6_; #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 284 "DataView.c" +#line 293 "DataView.c" } DataSource* data_view_get_source (DataView* self) { DataSource* result = NULL; - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; + DataSource* _tmp0_; + DataSource* _tmp1_; #line 55 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_val_if_fail (IS_DATA_VIEW (self), NULL); #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -298,13 +307,13 @@ DataSource* data_view_get_source (DataView* self) { result = _tmp1_; #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 302 "DataView.c" +#line 311 "DataView.c" } gboolean data_view_is_selected (DataView* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 59 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_val_if_fail (IS_DATA_VIEW (self), FALSE); #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -313,15 +322,15 @@ gboolean data_view_is_selected (DataView* self) { result = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 317 "DataView.c" +#line 326 "DataView.c" } void data_view_internal_set_selected (DataView* self, gboolean selected) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + 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" @@ -332,7 +341,7 @@ void data_view_internal_set_selected (DataView* self, gboolean selected) { if (_tmp0_ == _tmp1_) { #line 66 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 336 "DataView.c" +#line 345 "DataView.c" } #line 68 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp2_ = selected; @@ -341,16 +350,16 @@ void data_view_internal_set_selected (DataView* self, gboolean 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_by_name (self, "state-changed", _tmp3_); -#line 346 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp3_); +#line 355 "DataView.c" } gboolean data_view_internal_toggle (DataView* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; #line 73 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_val_if_fail (IS_DATA_VIEW (self), FALSE); #line 74 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -360,20 +369,20 @@ gboolean data_view_internal_toggle (DataView* self) { #line 75 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp1_ = self->priv->selected; #line 75 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit_by_name (self, "state-changed", _tmp1_); + g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp1_); #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp2_ = self->priv->selected; #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala" result = _tmp2_; #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 371 "DataView.c" +#line 380 "DataView.c" } gboolean data_view_is_visible (DataView* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 80 "/home/jens/Source/shotwell/src/core/DataView.vala" g_return_val_if_fail (IS_DATA_VIEW (self), FALSE); #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -382,15 +391,15 @@ gboolean data_view_is_visible (DataView* self) { result = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala" return result; -#line 386 "DataView.c" +#line 395 "DataView.c" } void data_view_internal_set_visible (DataView* self, gboolean visible) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + 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" @@ -401,7 +410,7 @@ void data_view_internal_set_visible (DataView* self, gboolean visible) { if (_tmp0_ == _tmp1_) { #line 87 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 405 "DataView.c" +#line 414 "DataView.c" } #line 89 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp2_ = visible; @@ -410,24 +419,24 @@ void data_view_internal_set_visible (DataView* self, gboolean 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_by_name (self, "visibility-changed", _tmp3_); -#line 415 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_); +#line 424 "DataView.c" } static void data_view_real_notify_view_altered (DataView* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; ViewCollection* vc = NULL; - DataCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; + DataCollection* _tmp1_; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; #line 95 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp0_ = self->priv->visible; #line 95 "/home/jens/Source/shotwell/src/core/DataView.vala" if (!_tmp0_) { #line 96 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 431 "DataView.c" +#line 440 "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)); @@ -437,7 +446,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 441 "DataView.c" +#line 450 "DataView.c" } #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala" vc = _tmp2_; @@ -445,10 +454,10 @@ 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 449 "DataView.c" - ViewCollection* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - ViewCollection* _tmp6_ = NULL; +#line 458 "DataView.c" + ViewCollection* _tmp4_; + gboolean _tmp5_; + ViewCollection* _tmp6_; #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp4_ = vc; #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -456,22 +465,22 @@ static void data_view_real_notify_view_altered (DataView* self) { #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala" if (!_tmp5_) { #line 101 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit_by_name (self, "view-altered"); -#line 461 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0); +#line 470 "DataView.c" } #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp6_ = vc; #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala" view_collection_internal_notify_view_altered (_tmp6_, self); -#line 467 "DataView.c" +#line 476 "DataView.c" } else { #line 106 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit_by_name (self, "view-altered"); -#line 471 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0); +#line 480 "DataView.c" } #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (vc); -#line 475 "DataView.c" +#line 484 "DataView.c" } @@ -480,23 +489,23 @@ void data_view_notify_view_altered (DataView* self) { 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 484 "DataView.c" +#line 493 "DataView.c" } static void data_view_real_notify_geometry_altered (DataView* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; ViewCollection* vc = NULL; - DataCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; + DataCollection* _tmp1_; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; #line 112 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp0_ = self->priv->visible; #line 112 "/home/jens/Source/shotwell/src/core/DataView.vala" if (!_tmp0_) { #line 113 "/home/jens/Source/shotwell/src/core/DataView.vala" return; -#line 500 "DataView.c" +#line 509 "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)); @@ -506,7 +515,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 510 "DataView.c" +#line 519 "DataView.c" } #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala" vc = _tmp2_; @@ -514,10 +523,10 @@ 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 518 "DataView.c" - ViewCollection* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - ViewCollection* _tmp6_ = NULL; +#line 527 "DataView.c" + ViewCollection* _tmp4_; + gboolean _tmp5_; + ViewCollection* _tmp6_; #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp4_ = vc; #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -525,22 +534,22 @@ static void data_view_real_notify_geometry_altered (DataView* self) { #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala" if (!_tmp5_) { #line 118 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit_by_name (self, "geometry-altered"); -#line 530 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0); +#line 539 "DataView.c" } #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala" _tmp6_ = vc; #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala" view_collection_internal_notify_geometry_altered (_tmp6_, self); -#line 536 "DataView.c" +#line 545 "DataView.c" } else { #line 123 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_emit_by_name (self, "geometry-altered"); -#line 540 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0); +#line 549 "DataView.c" } #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala" _data_collection_unref0 (vc); -#line 544 "DataView.c" +#line 553 "DataView.c" } @@ -549,19 +558,19 @@ void data_view_notify_geometry_altered (DataView* self) { 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 553 "DataView.c" +#line 562 "DataView.c" } static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #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_by_name (self, "unsubscribed", _tmp0_); -#line 565 "DataView.c" + g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, _tmp0_); +#line 574 "DataView.c" } @@ -570,7 +579,7 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source) { 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 574 "DataView.c" +#line 583 "DataView.c" } @@ -593,7 +602,7 @@ static void data_view_real_geometry_altered (DataView* self) { 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 597 "DataView.c" +#line 606 "DataView.c" } @@ -603,15 +612,15 @@ static void data_view_class_init (DataViewClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" g_type_class_add_private (klass, sizeof (DataViewPrivate)); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_view_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) data_view_real_get_name; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_view_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_view_real_to_string; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - ((DataViewClass *) klass)->notify_view_altered = (void (*)(DataView*)) data_view_real_notify_view_altered; + ((DataViewClass *) klass)->notify_view_altered = (void (*) (DataView *)) data_view_real_notify_view_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - ((DataViewClass *) klass)->notify_geometry_altered = (void (*)(DataView*)) data_view_real_notify_geometry_altered; + ((DataViewClass *) klass)->notify_geometry_altered = (void (*) (DataView *)) data_view_real_notify_geometry_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - ((DataViewClass *) klass)->notify_unsubscribed = (void (*)(DataView*, DataSource*)) data_view_real_notify_unsubscribed; + ((DataViewClass *) klass)->notify_unsubscribed = (void (*) (DataView *, DataSource*)) data_view_real_notify_unsubscribed; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" ((DataViewClass *) klass)->state_changed = data_view_real_state_changed; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -625,16 +634,16 @@ static void data_view_class_init (DataViewClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" G_OBJECT_CLASS (klass)->finalize = data_view_finalize; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_new ("state_changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, state_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL] = g_signal_new ("state-changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, state_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_new ("visibility_changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - g_signal_new ("view_altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, view_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL] = g_signal_new ("view-altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, view_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" - 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); + 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" - 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 638 "DataView.c" + 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" } @@ -645,13 +654,13 @@ static void data_view_instance_init (DataView * self) { self->priv->selected = FALSE; #line 10 "/home/jens/Source/shotwell/src/core/DataView.vala" self->priv->visible = TRUE; -#line 649 "DataView.c" +#line 658 "DataView.c" } -static void data_view_finalize (GObject* obj) { +static void data_view_finalize (GObject * obj) { DataView * self; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_VIEW, DataView); #line 44 "/home/jens/Source/shotwell/src/core/DataView.vala" @@ -662,7 +671,7 @@ 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 666 "DataView.c" +#line 675 "DataView.c" } diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c index 806bca2..c1ae9e3 100644 --- a/src/core/DataViewTypes.c +++ b/src/core/DataViewTypes.c @@ -1,4 +1,4 @@ -/* DataViewTypes.c generated by valac 0.34.7, the Vala compiler +/* DataViewTypes.c generated by valac 0.36.6, the Vala compiler * generated from DataViewTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -85,6 +85,11 @@ typedef struct _ThumbnailViewPrivate ThumbnailViewPrivate; typedef struct _ThumbnailSource ThumbnailSource; typedef struct _ThumbnailSourceClass ThumbnailSourceClass; +enum { + THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL, + THUMBNAIL_VIEW_LAST_SIGNAL +}; +static guint thumbnail_view_signals[THUMBNAIL_VIEW_LAST_SIGNAL] = {0}; #define TYPE_PHOTO_VIEW (photo_view_get_type ()) #define PHOTO_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_VIEW, PhotoView)) @@ -294,7 +299,7 @@ EventSource* event_view_get_event_source (EventView* self); ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source) { ThumbnailView * self = NULL; - ThumbnailSource* _tmp0_ = 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" @@ -303,21 +308,21 @@ ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* sou self = (ThumbnailView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); #line 11 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 307 "DataViewTypes.c" +#line 312 "DataViewTypes.c" } 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 314 "DataViewTypes.c" +#line 319 "DataViewTypes.c" } static void thumbnail_view_real_notify_thumbnail_altered (ThumbnailView* self) { #line 17 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - g_signal_emit_by_name (self, "thumbnail-altered"); -#line 321 "DataViewTypes.c" + g_signal_emit (self, thumbnail_view_signals[THUMBNAIL_VIEW_THUMBNAIL_ALTERED_SIGNAL], 0); +#line 326 "DataViewTypes.c" } @@ -326,7 +331,7 @@ void thumbnail_view_notify_thumbnail_altered (ThumbnailView* self) { 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 330 "DataViewTypes.c" +#line 335 "DataViewTypes.c" } @@ -338,12 +343,12 @@ 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" - ((ThumbnailViewClass *) klass)->notify_thumbnail_altered = (void (*)(ThumbnailView*)) thumbnail_view_real_notify_thumbnail_altered; + ((ThumbnailViewClass *) klass)->notify_thumbnail_altered = (void (*) (ThumbnailView *)) thumbnail_view_real_notify_thumbnail_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" ((ThumbnailViewClass *) klass)->thumbnail_altered = thumbnail_view_real_thumbnail_altered; #line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" - 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 347 "DataViewTypes.c" + 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" } @@ -365,7 +370,7 @@ GType thumbnail_view_get_type (void) { PhotoView* photo_view_construct (GType object_type, PhotoSource* source) { PhotoView * self = NULL; - PhotoSource* _tmp0_ = 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" @@ -374,20 +379,20 @@ PhotoView* photo_view_construct (GType object_type, PhotoSource* source) { self = (PhotoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 22 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 378 "DataViewTypes.c" +#line 383 "DataViewTypes.c" } 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 385 "DataViewTypes.c" +#line 390 "DataViewTypes.c" } PhotoSource* photo_view_get_photo_source (PhotoView* self) { PhotoSource* result = NULL; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 26 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_PHOTO_VIEW (self), NULL); #line 27 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -396,14 +401,14 @@ 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 400 "DataViewTypes.c" +#line 405 "DataViewTypes.c" } 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 407 "DataViewTypes.c" +#line 412 "DataViewTypes.c" } @@ -425,7 +430,7 @@ GType photo_view_get_type (void) { VideoView* video_view_construct (GType object_type, VideoSource* source) { VideoView * self = NULL; - VideoSource* _tmp0_ = 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" @@ -434,20 +439,20 @@ VideoView* video_view_construct (GType object_type, VideoSource* source) { self = (VideoView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 32 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 438 "DataViewTypes.c" +#line 443 "DataViewTypes.c" } 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 445 "DataViewTypes.c" +#line 450 "DataViewTypes.c" } VideoSource* video_view_get_video_source (VideoView* self) { VideoSource* result = NULL; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 36 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_VIDEO_VIEW (self), NULL); #line 37 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -456,14 +461,14 @@ 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 460 "DataViewTypes.c" +#line 465 "DataViewTypes.c" } 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 467 "DataViewTypes.c" +#line 472 "DataViewTypes.c" } @@ -485,7 +490,7 @@ GType video_view_get_type (void) { EventView* event_view_construct (GType object_type, EventSource* source) { EventView * self = NULL; - EventSource* _tmp0_ = 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" @@ -494,20 +499,20 @@ EventView* event_view_construct (GType object_type, EventSource* source) { self = (EventView*) thumbnail_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 42 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" return self; -#line 498 "DataViewTypes.c" +#line 503 "DataViewTypes.c" } 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 505 "DataViewTypes.c" +#line 510 "DataViewTypes.c" } EventSource* event_view_get_event_source (EventView* self) { EventSource* result = NULL; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 46 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" g_return_val_if_fail (IS_EVENT_VIEW (self), NULL); #line 47 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala" @@ -516,14 +521,14 @@ 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 520 "DataViewTypes.c" +#line 525 "DataViewTypes.c" } 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 527 "DataViewTypes.c" +#line 532 "DataViewTypes.c" } diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c index d21ab1b..192d771 100644 --- a/src/core/DatabaseSourceCollection.c +++ b/src/core/DatabaseSourceCollection.c @@ -1,4 +1,4 @@ -/* DatabaseSourceCollection.c generated by valac 0.34.7, the Vala compiler +/* DatabaseSourceCollection.c generated by valac 0.36.6, the Vala compiler * generated from DatabaseSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -295,7 +295,7 @@ void data_collection_notify_items_added (DataCollection* self, GeeIterable* adde 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); +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); @@ -315,7 +315,7 @@ SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceColle 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 void database_source_holding_tank_finalize (SourceHoldingTank * obj); static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self) { @@ -350,9 +350,9 @@ 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) { DatabaseSourceCollection* self = NULL; - const gchar* _tmp0_ = NULL; - GetSourceDatabaseKey _tmp1_ = NULL; - void* _tmp1__target = 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" @@ -382,7 +382,7 @@ static gpointer _g_object_ref0 (gpointer self) { static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { DatabaseSourceCollection * self; - GeeIterable* _tmp17_ = NULL; + 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" @@ -390,8 +390,8 @@ static void database_source_collection_real_notify_items_added (DataCollection* #line 391 "DatabaseSourceCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp0_ = added; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -401,25 +401,25 @@ static void database_source_collection_real_notify_items_added (DataCollection* #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { #line 404 "DatabaseSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; DataSource* source = NULL; - DataObject* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; + DataObject* _tmp6_; + DataSource* _tmp7_; gint64 key = 0LL; - GetSourceDatabaseKey _tmp8_ = NULL; - void* _tmp8__target = NULL; - DataSource* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; - GeeHashMap* _tmp11_ = NULL; - gint64 _tmp12_ = 0LL; - gboolean _tmp13_ = FALSE; - GeeHashMap* _tmp14_ = NULL; - gint64 _tmp15_ = 0LL; - DataSource* _tmp16_ = NULL; + 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; #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -488,7 +488,7 @@ static void database_source_collection_real_notify_items_added (DataCollection* static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { DatabaseSourceCollection * self; - GeeIterable* _tmp13_ = NULL; + 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" @@ -496,8 +496,8 @@ static void database_source_collection_real_notify_items_removed (DataCollection #line 497 "DatabaseSourceCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp0_ = removed; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -507,21 +507,21 @@ static void database_source_collection_real_notify_items_removed (DataCollection #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { #line 510 "DatabaseSourceCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; gint64 key = 0LL; - GetSourceDatabaseKey _tmp6_ = NULL; - void* _tmp6__target = NULL; - DataObject* _tmp7_ = NULL; - gint64 _tmp8_ = 0LL; + GetSourceDatabaseKey _tmp6_; + void* _tmp6__target; + DataObject* _tmp7_; + gint64 _tmp8_; gboolean is_removed = FALSE; - GeeHashMap* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; + GeeHashMap* _tmp9_; + gint64 _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp2_ = _object_it; #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -578,9 +578,9 @@ static void database_source_collection_real_notify_items_removed (DataCollection DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key) { DataSource* result = NULL; - GeeHashMap* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + gint64 _tmp1_; + gpointer _tmp2_; #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" @@ -605,15 +605,15 @@ static void database_source_collection_class_init (DatabaseSourceCollectionClass #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" g_type_class_add_private (klass, sizeof (DatabaseSourceCollectionPrivate)); #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" - ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) database_source_collection_real_notify_items_added; + ((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; + ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_removed; #line 612 "DatabaseSourceCollection.c" } static void database_source_collection_instance_init (DatabaseSourceCollection * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv = DATABASE_SOURCE_COLLECTION_GET_PRIVATE (self); #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -624,7 +624,7 @@ static void database_source_collection_instance_init (DatabaseSourceCollection * } -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); @@ -650,11 +650,11 @@ 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* self = NULL; - SourceCollection* _tmp0_ = NULL; - SourceHoldingTankCheckToKeep _tmp1_ = NULL; - void* _tmp1__target = NULL; - GetSourceDatabaseKey _tmp2_ = NULL; - void* _tmp2__target = 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" @@ -688,9 +688,9 @@ DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* s DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id) { DataSource* result = NULL; - GeeHashMap* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + gint64 _tmp1_; + gpointer _tmp2_; #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" @@ -709,10 +709,10 @@ DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* s static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) { DatabaseSourceHoldingTank * self; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp12_ = NULL; - GeeCollection* _tmp23_ = NULL; - GeeCollection* _tmp24_ = NULL; + 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" @@ -726,8 +726,8 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol #line 727 "DatabaseSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp1_ = added; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -737,17 +737,17 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { #line 740 "DatabaseSourceCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeIterator* _tmp3_; + gboolean _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - GeeHashMap* _tmp7_ = NULL; - GetSourceDatabaseKey _tmp8_ = NULL; - void* _tmp8__target = NULL; - DataSource* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; - DataSource* _tmp11_ = 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; #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -794,8 +794,8 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol #line 795 "DatabaseSourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp13_ = removed; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -805,16 +805,16 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" while (TRUE) { #line 808 "DatabaseSourceCollection.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeIterator* _tmp15_; + gboolean _tmp16_; DataSource* source = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; - GeeHashMap* _tmp19_ = NULL; - GetSourceDatabaseKey _tmp20_ = NULL; - void* _tmp20__target = NULL; - DataSource* _tmp21_ = NULL; - gint64 _tmp22_ = 0LL; + GeeIterator* _tmp17_; + gpointer _tmp18_; + GeeHashMap* _tmp19_; + GetSourceDatabaseKey _tmp20_; + void* _tmp20__target; + DataSource* _tmp21_; + gint64 _tmp22_; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" _tmp15_ = _source_it; #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -870,13 +870,13 @@ static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankCl #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" 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; + ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered; #line 875 "DatabaseSourceCollection.c" } static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" self->priv = DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE (self); #line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala" @@ -887,7 +887,7 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan } -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); diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 96c0bfd..0e96c86 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.34.7, the Vala compiler +/* SourceCollection.c generated by valac 0.36.6, the Vala compiler * generated from SourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -116,6 +116,16 @@ 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_ITEMS_UNLINKING_SIGNAL, + SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL, + SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL, + SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL, + SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL, + SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL, + SOURCE_COLLECTION_LAST_SIGNAL +}; +static guint source_collection_signals[SOURCE_COLLECTION_LAST_SIGNAL] = {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; } @@ -321,13 +331,13 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo enum { SOURCE_COLLECTION_DESTROY_COUNTER_DUMMY_PROPERTY }; -static void source_collection_destroy_counter_finalize (GObject* obj); -static void source_collection_finalize (DataCollection* obj); +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* self = NULL; - const gchar* _tmp0_ = 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" @@ -336,7 +346,7 @@ SourceCollection* source_collection_construct (GType object_type, const gchar* n self = (SourceCollection*) data_collection_construct (object_type, _tmp0_); #line 50 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 340 "SourceCollection.c" +#line 350 "SourceCollection.c" } @@ -346,7 +356,7 @@ static gboolean source_collection_real_holds_type_of_source (SourceCollection* s 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 350 "SourceCollection.c" +#line 360 "SourceCollection.c" } @@ -355,19 +365,19 @@ gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSou 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 359 "SourceCollection.c" +#line 369 "SourceCollection.c" } static void source_collection_real_notify_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "items-unlinking", _tmp0_); -#line 371 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL], 0, _tmp0_); +#line 381 "SourceCollection.c" } @@ -376,19 +386,19 @@ void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollec 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 380 "SourceCollection.c" +#line 390 "SourceCollection.c" } static void source_collection_real_notify_items_relinked (SourceCollection* self, GeeCollection* relinked) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "items-relinked", _tmp0_); -#line 392 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL], 0, _tmp0_); +#line 402 "SourceCollection.c" } @@ -397,19 +407,19 @@ void source_collection_notify_items_relinked (SourceCollection* self, GeeCollect 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 401 "SourceCollection.c" +#line 411 "SourceCollection.c" } static void source_collection_real_notify_item_destroyed (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #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_by_name (self, "item-destroyed", _tmp0_); -#line 413 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL], 0, _tmp0_); +#line 423 "SourceCollection.c" } @@ -418,19 +428,19 @@ void source_collection_notify_item_destroyed (SourceCollection* self, DataSource 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 422 "SourceCollection.c" +#line 432 "SourceCollection.c" } static void source_collection_real_notify_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "items-destroyed", _tmp0_); -#line 434 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL], 0, _tmp0_); +#line 444 "SourceCollection.c" } @@ -439,19 +449,19 @@ void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollec 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 443 "SourceCollection.c" +#line 453 "SourceCollection.c" } static void source_collection_real_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #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_by_name (self, "unlinked-destroyed", _tmp0_); -#line 455 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_UNLINKED_DESTROYED_SIGNAL], 0, _tmp0_); +#line 465 "SourceCollection.c" } @@ -460,13 +470,13 @@ void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSo 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 464 "SourceCollection.c" +#line 474 "SourceCollection.c" } static void source_collection_real_notify_backlink_removed (SourceCollection* self, SourceBacklink* backlink, GeeCollection* sources) { - SourceBacklink* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + SourceBacklink* _tmp0_; + GeeCollection* _tmp1_; #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" @@ -476,8 +486,8 @@ static void source_collection_real_notify_backlink_removed (SourceCollection* se #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_by_name (self, "backlink-removed", _tmp0_, _tmp1_); -#line 481 "SourceCollection.c" + g_signal_emit (self, source_collection_signals[SOURCE_COLLECTION_BACKLINK_REMOVED_SIGNAL], 0, _tmp0_, _tmp1_); +#line 491 "SourceCollection.c" } @@ -486,14 +496,14 @@ void source_collection_notify_backlink_removed (SourceCollection* self, SourceBa 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 490 "SourceCollection.c" +#line 500 "SourceCollection.c" } static gboolean source_collection_real_valid_type (DataCollection* base, DataObject* object) { SourceCollection * self; gboolean result = FALSE; - DataObject* _tmp0_ = NULL; + 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" @@ -504,7 +514,7 @@ static gboolean source_collection_real_valid_type (DataCollection* base, DataObj result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_SOURCE); #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 508 "SourceCollection.c" +#line 518 "SourceCollection.c" } @@ -513,7 +523,7 @@ static gboolean _source_collection_destroy_and_delete_source_marked_action (Data result = source_collection_destroy_and_delete_source ((SourceCollection*) self, object, user); #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 517 "SourceCollection.c" +#line 527 "SourceCollection.c" } @@ -522,34 +532,34 @@ static gboolean _source_collection_destroy_source_marked_action (DataObject* obj result = source_collection_destroy_source ((SourceCollection*) self, object, user); #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 526 "SourceCollection.c" +#line 536 "SourceCollection.c" } 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 533 "SourceCollection.c" +#line 543 "SourceCollection.c" } 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_ = NULL; - Marker* _tmp1_ = NULL; - SourceCollectionDestroyCounter* _tmp2_ = NULL; - SourceCollectionDestroyCounter* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - SourceCollectionDestroyCounter* _tmp24_ = NULL; - GeeArrayList* _tmp25_ = NULL; - SourceCollectionDestroyCounter* _tmp26_ = NULL; - Marker* _tmp27_ = NULL; - GeeList* _tmp28_ = NULL; - SourceCollectionDestroyCounter* _tmp32_ = NULL; - GeeArrayList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + 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_; #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" @@ -572,11 +582,11 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp4_ = delete_backing; #line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp4_) { -#line 576 "SourceCollection.c" - Marker* _tmp5_ = NULL; - ProgressMonitor _tmp6_ = NULL; - void* _tmp6__target = NULL; - SourceCollectionDestroyCounter* _tmp7_ = NULL; +#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" @@ -587,12 +597,12 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp7_ = 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 591 "SourceCollection.c" +#line 601 "SourceCollection.c" } else { - Marker* _tmp8_ = NULL; - ProgressMonitor _tmp9_ = NULL; - void* _tmp9__target = NULL; - SourceCollectionDestroyCounter* _tmp10_ = NULL; + Marker* _tmp8_; + ProgressMonitor _tmp9_; + void* _tmp9__target; + SourceCollectionDestroyCounter* _tmp10_; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp8_ = marker; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -603,17 +613,17 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _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 607 "SourceCollection.c" +#line 617 "SourceCollection.c" } { GeeArrayList* _source_list = NULL; - SourceCollectionDestroyCounter* _tmp11_ = NULL; - GeeArrayList* _tmp12_ = NULL; - GeeArrayList* _tmp13_ = NULL; + SourceCollectionDestroyCounter* _tmp11_; + GeeArrayList* _tmp12_; + GeeArrayList* _tmp13_; gint _source_size = 0; - GeeArrayList* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; + GeeArrayList* _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _source_index = 0; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp11_ = counter; @@ -635,15 +645,15 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _source_index = -1; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 639 "SourceCollection.c" - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gint _tmp19_ = 0; +#line 649 "SourceCollection.c" + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; DataSource* source = NULL; - GeeArrayList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gpointer _tmp22_ = NULL; - DataSource* _tmp23_ = NULL; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; + DataSource* _tmp23_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp17_ = _source_index; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -656,7 +666,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g if (!(_tmp18_ < _tmp19_)) { #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 660 "SourceCollection.c" +#line 670 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp20_ = _source_list; @@ -672,11 +682,11 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g source_collection_notify_item_destroyed (self, _tmp23_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 676 "SourceCollection.c" +#line 686 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 680 "SourceCollection.c" +#line 690 "SourceCollection.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp24_ = counter; @@ -694,10 +704,10 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp28_ = not_removed; #line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (NULL != _tmp28_) { -#line 698 "SourceCollection.c" - GeeList* _tmp29_ = NULL; - SourceCollectionDestroyCounter* _tmp30_ = NULL; - GeeArrayList* _tmp31_ = NULL; +#line 708 "SourceCollection.c" + GeeList* _tmp29_; + SourceCollectionDestroyCounter* _tmp30_; + GeeArrayList* _tmp31_; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp29_ = not_removed; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -706,7 +716,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp31_ = _tmp30_->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 710 "SourceCollection.c" +#line 720 "SourceCollection.c" } #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp32_ = counter; @@ -722,7 +732,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _g_object_unref0 (counter); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 726 "SourceCollection.c" +#line 736 "SourceCollection.c" } @@ -730,11 +740,11 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s gboolean result = FALSE; gboolean success = FALSE; gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + gboolean _tmp5_; gboolean _tmp10_ = FALSE; - DataObject* _tmp11_ = NULL; - GObject* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + DataObject* _tmp11_; + GObject* _tmp12_; + gboolean _tmp13_; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); @@ -744,11 +754,11 @@ 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 748 "SourceCollection.c" +#line 758 "SourceCollection.c" { gboolean _tmp0_ = FALSE; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = 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" @@ -757,12 +767,12 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _tmp0_ = _tmp2_; #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 761 "SourceCollection.c" +#line 771 "SourceCollection.c" goto __catch49_g_error; } #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = _tmp0_; -#line 766 "SourceCollection.c" +#line 776 "SourceCollection.c" } goto __finally49; __catch49_g_error: @@ -776,12 +786,12 @@ 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 780 "SourceCollection.c" +#line 790 "SourceCollection.c" } __finally49: #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 785 "SourceCollection.c" +#line 795 "SourceCollection.c" gboolean _tmp3_ = 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); @@ -789,30 +799,30 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s g_clear_error (&_inner_error_); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return _tmp3_; -#line 793 "SourceCollection.c" +#line 803 "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 799 "SourceCollection.c" - DataObject* _tmp6_ = NULL; +#line 809 "SourceCollection.c" + DataObject* _tmp6_; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp6_ = object; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE); -#line 805 "SourceCollection.c" +#line 815 "SourceCollection.c" } else { #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp4_ = FALSE; -#line 809 "SourceCollection.c" +#line 819 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp4_) { -#line 813 "SourceCollection.c" - GObject* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - DataObject* _tmp9_ = NULL; +#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" @@ -821,7 +831,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _tmp9_ = object; #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 825 "SourceCollection.c" +#line 835 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp11_ = object; @@ -831,35 +841,35 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_); #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp13_) { -#line 835 "SourceCollection.c" - gboolean _tmp14_ = FALSE; +#line 845 "SourceCollection.c" + gboolean _tmp14_; #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 841 "SourceCollection.c" +#line 851 "SourceCollection.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp10_ = FALSE; -#line 845 "SourceCollection.c" +#line 855 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = _tmp10_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 851 "SourceCollection.c" +#line 861 "SourceCollection.c" } static gboolean source_collection_destroy_source (SourceCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - GObject* _tmp2_ = NULL; - Marker* _tmp3_ = NULL; - GObject* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; + DataObject* _tmp0_; + DataSource* _tmp1_; + GObject* _tmp2_; + Marker* _tmp3_; + GObject* _tmp4_; + GeeArrayList* _tmp5_; #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" @@ -894,7 +904,7 @@ static gboolean source_collection_destroy_source (SourceCollection* self, DataOb _g_object_unref0 (source); #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 898 "SourceCollection.c" +#line 908 "SourceCollection.c" } @@ -903,7 +913,7 @@ static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpo result = source_backlink_hash_func ((SourceBacklink*) v); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 907 "SourceCollection.c" +#line 917 "SourceCollection.c" } @@ -912,15 +922,15 @@ static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a result = source_backlink_equal_func ((SourceBacklink*) a, (SourceBacklink*) b); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 916 "SourceCollection.c" +#line 926 "SourceCollection.c" } void source_collection_internal_backlink_set (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { - GeeMultiMap* _tmp0_ = NULL; - GeeMultiMap* _tmp2_ = NULL; - SourceBacklink* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; + 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" @@ -931,15 +941,15 @@ 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 935 "SourceCollection.c" - GeeHashMultiMap* _tmp1_ = NULL; +#line 945 "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); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _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 943 "SourceCollection.c" +#line 953 "SourceCollection.c" } #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; @@ -949,17 +959,17 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _tmp4_ = source; #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" gee_multi_map_set (_tmp2_, _tmp3_, _tmp4_); -#line 953 "SourceCollection.c" +#line 963 "SourceCollection.c" } void source_collection_internal_backlink_removed (SourceCollection* self, DataSource* source, SourceBacklink* backlink) { - GeeMultiMap* _tmp0_ = NULL; + GeeMultiMap* _tmp0_; gboolean removed = FALSE; - GeeMultiMap* _tmp1_ = NULL; - SourceBacklink* _tmp2_ = NULL; - DataSource* _tmp3_ = NULL; - gboolean _tmp4_ = 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" @@ -982,24 +992,24 @@ void source_collection_internal_backlink_removed (SourceCollection* self, DataSo removed = _tmp4_; #line 154 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _vala_assert (removed, "removed"); -#line 986 "SourceCollection.c" +#line 996 "SourceCollection.c" } static gboolean source_collection_real_has_backlink (SourceCollection* self, SourceBacklink* backlink) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GeeMultiMap* _tmp1_ = NULL; + GeeMultiMap* _tmp1_; #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE); #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp1_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp1_ != NULL) { -#line 1000 "SourceCollection.c" - GeeMultiMap* _tmp2_ = NULL; - SourceBacklink* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1010 "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" @@ -1008,17 +1018,17 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou _tmp4_ = gee_multi_map_contains (_tmp2_, _tmp3_); #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = _tmp4_; -#line 1012 "SourceCollection.c" +#line 1022 "SourceCollection.c" } else { #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = FALSE; -#line 1016 "SourceCollection.c" +#line 1026 "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 1022 "SourceCollection.c" +#line 1032 "SourceCollection.c" } @@ -1027,7 +1037,7 @@ gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* 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 1031 "SourceCollection.c" +#line 1041 "SourceCollection.c" } @@ -1036,25 +1046,25 @@ static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* result = source_collection_prepare_for_unlink ((SourceCollection*) self, object, user); #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1040 "SourceCollection.c" +#line 1050 "SourceCollection.c" } GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* marker, ProgressMonitor monitor, void* monitor_target) { GeeCollection* result = NULL; GeeArrayList* list = NULL; - GeeArrayList* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; - ProgressMonitor _tmp2_ = NULL; - void* _tmp2__target = NULL; - GeeArrayList* _tmp3_ = NULL; - GeeArrayList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - GeeArrayList* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - Marker* _tmp9_ = NULL; - Marker* _tmp10_ = 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_; #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" @@ -1087,7 +1097,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* _g_object_unref0 (list); #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1091 "SourceCollection.c" +#line 1101 "SourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = list; @@ -1107,16 +1117,16 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection); #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1111 "SourceCollection.c" +#line 1121 "SourceCollection.c" } static gboolean source_collection_prepare_for_unlink (SourceCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; DataSource* source = NULL; - DataObject* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - GObject* _tmp2_ = NULL; + DataObject* _tmp0_; + DataSource* _tmp1_; + GObject* _tmp2_; #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" @@ -1141,17 +1151,17 @@ static gboolean source_collection_prepare_for_unlink (SourceCollection* self, Da _g_object_unref0 (source); #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1145 "SourceCollection.c" +#line 1155 "SourceCollection.c" } void source_collection_relink (SourceCollection* self, DataSource* source) { - DataSource* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - DataSource* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - DataSource* _tmp5_ = NULL; + DataSource* _tmp0_; + DataSource* _tmp1_; + DataSource* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + DataSource* _tmp5_; #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" @@ -1178,18 +1188,18 @@ void source_collection_relink (SourceCollection* self, DataSource* source) { _tmp5_ = source; #line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_notify_relinked (_tmp5_); -#line 1182 "SourceCollection.c" +#line 1192 "SourceCollection.c" } void source_collection_relink_many (SourceCollection* self, GeeCollection* relink) { - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GeeCollection* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - GeeCollection* _tmp13_ = NULL; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; + GeeCollection* _tmp13_; #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" @@ -1204,12 +1214,12 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (_tmp2_ == 0) { #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1208 "SourceCollection.c" +#line 1218 "SourceCollection.c" } { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp3_ = relink; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1218,13 +1228,13 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _source_it = _tmp4_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1222 "SourceCollection.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 1232 "SourceCollection.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; DataSource* source = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataSource* _tmp9_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp5_ = _source_it; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1233,7 +1243,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (!_tmp6_) { #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1237 "SourceCollection.c" +#line 1247 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = _source_it; @@ -1247,11 +1257,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin data_source_notify_relinking (_tmp9_, self); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1251 "SourceCollection.c" +#line 1261 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1255 "SourceCollection.c" +#line 1265 "SourceCollection.c" } #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp10_ = relink; @@ -1265,11 +1275,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _tmp13_ = relink; #line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_notify_items_relinked (self, _tmp13_); -#line 1269 "SourceCollection.c" +#line 1279 "SourceCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp14_ = NULL; - GeeIterator* _tmp15_ = NULL; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp14_ = relink; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1278,13 +1288,13 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _source_it = _tmp15_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1282 "SourceCollection.c" - GeeIterator* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 1292 "SourceCollection.c" + GeeIterator* _tmp16_; + gboolean _tmp17_; DataSource* source = NULL; - GeeIterator* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - DataSource* _tmp20_ = NULL; + GeeIterator* _tmp18_; + gpointer _tmp19_; + DataSource* _tmp20_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp16_ = _source_it; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1293,7 +1303,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (!_tmp17_) { #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1297 "SourceCollection.c" +#line 1307 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp18_ = _source_it; @@ -1307,26 +1317,26 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin data_source_notify_relinked (_tmp20_); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1311 "SourceCollection.c" +#line 1321 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1315 "SourceCollection.c" +#line 1325 "SourceCollection.c" } } static void source_collection_real_remove_backlink (SourceCollection* self, SourceBacklink* backlink) { - GeeMultiMap* _tmp0_ = NULL; + GeeMultiMap* _tmp0_; GeeArrayList* sources = NULL; - GeeArrayList* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeMultiMap* _tmp3_ = NULL; - SourceBacklink* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - SourceBacklink* _tmp20_ = NULL; - GeeArrayList* _tmp21_ = NULL; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp2_; + GeeMultiMap* _tmp3_; + SourceBacklink* _tmp4_; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + SourceBacklink* _tmp20_; + GeeArrayList* _tmp21_; #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" @@ -1335,7 +1345,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 1339 "SourceCollection.c" +#line 1349 "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); @@ -1355,15 +1365,15 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour gee_array_list_add_all (_tmp2_, _tmp6_); #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_tmp6_); -#line 1359 "SourceCollection.c" +#line 1369 "SourceCollection.c" { GeeArrayList* _source_list = NULL; - GeeArrayList* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; + GeeArrayList* _tmp7_; + GeeArrayList* _tmp8_; gint _source_size = 0; - GeeArrayList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + GeeArrayList* _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _source_index = 0; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = sources; @@ -1383,16 +1393,16 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour _source_index = -1; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1387 "SourceCollection.c" - gint _tmp12_ = 0; - gint _tmp13_ = 0; - gint _tmp14_ = 0; +#line 1397 "SourceCollection.c" + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; DataSource* source = NULL; - GeeArrayList* _tmp15_ = NULL; - gint _tmp16_ = 0; - gpointer _tmp17_ = NULL; - DataSource* _tmp18_ = NULL; - SourceBacklink* _tmp19_ = NULL; + GeeArrayList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + DataSource* _tmp18_; + SourceBacklink* _tmp19_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp12_ = _source_index; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1405,7 +1415,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour if (!(_tmp13_ < _tmp14_)) { #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1409 "SourceCollection.c" +#line 1419 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp15_ = _source_list; @@ -1423,11 +1433,11 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour data_source_remove_backlink (_tmp18_, _tmp19_); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1427 "SourceCollection.c" +#line 1437 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 1431 "SourceCollection.c" +#line 1441 "SourceCollection.c" } #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp20_ = backlink; @@ -1437,7 +1447,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour source_collection_notify_backlink_removed (self, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (sources); -#line 1441 "SourceCollection.c" +#line 1451 "SourceCollection.c" } @@ -1446,42 +1456,42 @@ void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* 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 1450 "SourceCollection.c" +#line 1460 "SourceCollection.c" } 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 1457 "SourceCollection.c" +#line 1467 "SourceCollection.c" } 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 1464 "SourceCollection.c" +#line 1474 "SourceCollection.c" } 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 1471 "SourceCollection.c" +#line 1481 "SourceCollection.c" } 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 1478 "SourceCollection.c" +#line 1488 "SourceCollection.c" } 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 1485 "SourceCollection.c" +#line 1495 "SourceCollection.c" } @@ -1490,7 +1500,7 @@ static void source_collection_real_backlink_removed (SourceCollection* self, Sou 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 1494 "SourceCollection.c" +#line 1504 "SourceCollection.c" } @@ -1509,26 +1519,26 @@ 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 1513 "SourceCollection.c" +#line 1523 "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 1519 "SourceCollection.c" +#line 1529 "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 1525 "SourceCollection.c" +#line 1535 "SourceCollection.c" } static SourceCollectionDestroyCounter* source_collection_destroy_counter_construct (GType object_type, Marker* remove_marker) { SourceCollectionDestroyCounter * self = NULL; - Marker* _tmp0_ = NULL; - Marker* _tmp1_ = 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" @@ -1543,14 +1553,14 @@ static SourceCollectionDestroyCounter* source_collection_destroy_counter_constru self->remove_marker = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 1547 "SourceCollection.c" +#line 1557 "SourceCollection.c" } 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 1554 "SourceCollection.c" +#line 1564 "SourceCollection.c" } @@ -1559,13 +1569,13 @@ static void source_collection_destroy_counter_class_init (SourceCollectionDestro 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 1563 "SourceCollection.c" +#line 1573 "SourceCollection.c" } static void source_collection_destroy_counter_instance_init (SourceCollectionDestroyCounter * self) { - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp1_; #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1574,11 +1584,11 @@ 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 1578 "SourceCollection.c" +#line 1588 "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); @@ -1590,7 +1600,7 @@ 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 1594 "SourceCollection.c" +#line 1604 "SourceCollection.c" } @@ -1614,25 +1624,25 @@ static void source_collection_class_init (SourceCollectionClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_type_class_add_private (klass, sizeof (SourceCollectionPrivate)); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) source_collection_real_holds_type_of_source; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_unlinking = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_unlinking; + ((SourceCollectionClass *) klass)->notify_items_unlinking = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_unlinking; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_relinked = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_relinked; + ((SourceCollectionClass *) klass)->notify_items_relinked = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_relinked; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_item_destroyed; + ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*) (SourceCollection *, DataSource*)) source_collection_real_notify_item_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_destroyed = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_destroyed; + ((SourceCollectionClass *) klass)->notify_items_destroyed = (void (*) (SourceCollection *, GeeCollection*)) source_collection_real_notify_items_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_unlinked_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_unlinked_destroyed; + ((SourceCollectionClass *) klass)->notify_unlinked_destroyed = (void (*) (SourceCollection *, DataSource*)) source_collection_real_notify_unlinked_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) source_collection_real_notify_backlink_removed; + ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*) (SourceCollection *, SourceBacklink*, GeeCollection*)) source_collection_real_notify_backlink_removed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) source_collection_real_valid_type; + ((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) source_collection_real_valid_type; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*)(SourceCollection*, SourceBacklink*)) source_collection_real_has_backlink; + ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*) (SourceCollection *, SourceBacklink*)) source_collection_real_has_backlink; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->remove_backlink = (void (*)(SourceCollection*, SourceBacklink*)) source_collection_real_remove_backlink; + ((SourceCollectionClass *) klass)->remove_backlink = (void (*) (SourceCollection *, SourceBacklink*)) source_collection_real_remove_backlink; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" ((SourceCollectionClass *) klass)->items_unlinking = source_collection_real_items_unlinking; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1646,18 +1656,18 @@ static void source_collection_class_init (SourceCollectionClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" ((SourceCollectionClass *) klass)->backlink_removed = source_collection_real_backlink_removed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("items_unlinking", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_unlinking), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + source_collection_signals[SOURCE_COLLECTION_ITEMS_UNLINKING_SIGNAL] = g_signal_new ("items-unlinking", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_unlinking), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("items_relinked", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_relinked), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + source_collection_signals[SOURCE_COLLECTION_ITEMS_RELINKED_SIGNAL] = g_signal_new ("items-relinked", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_relinked), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - g_signal_new ("item_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, item_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); + source_collection_signals[SOURCE_COLLECTION_ITEM_DESTROYED_SIGNAL] = g_signal_new ("item-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, item_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" - g_signal_new ("items_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + source_collection_signals[SOURCE_COLLECTION_ITEMS_DESTROYED_SIGNAL] = g_signal_new ("items-destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, items_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - 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); + 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" - 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 1661 "SourceCollection.c" + 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" } @@ -1666,11 +1676,11 @@ static void source_collection_instance_init (SourceCollection * self) { self->priv = SOURCE_COLLECTION_GET_PRIVATE (self); #line 48 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = NULL; -#line 1670 "SourceCollection.c" +#line 1680 "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); @@ -1678,7 +1688,7 @@ 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 1682 "SourceCollection.c" +#line 1692 "SourceCollection.c" } diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c index 1203f72..7d92788 100644 --- a/src/core/SourceHoldingTank.c +++ b/src/core/SourceHoldingTank.c @@ -1,4 +1,4 @@ -/* SourceHoldingTank.c generated by valac 0.34.7, the Vala compiler +/* SourceHoldingTank.c generated by valac 0.36.6, the Vala compiler * generated from SourceHoldingTank.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -134,6 +134,11 @@ typedef struct _SingletonCollection SingletonCollection; typedef struct _SingletonCollectionClass SingletonCollectionClass; #define _g_free0(var) (var = (g_free (var), NULL)) typedef struct _ParamSpecSourceHoldingTank ParamSpecSourceHoldingTank; +enum { + SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL, + SOURCE_HOLDING_TANK_LAST_SIGNAL +}; +static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_LAST_SIGNAL] = {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; } @@ -269,38 +274,38 @@ 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_finalize (SourceHoldingTank * obj); 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 279 "SourceHoldingTank.c" +#line 284 "SourceHoldingTank.c" } 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 286 "SourceHoldingTank.c" +#line 291 "SourceHoldingTank.c" } 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 293 "SourceHoldingTank.c" +#line 298 "SourceHoldingTank.c" } SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) { SourceHoldingTank* self = NULL; - SourceCollection* _tmp0_ = NULL; - SourceCollection* _tmp1_ = NULL; - SourceHoldingTankCheckToKeep _tmp2_ = NULL; - void* _tmp2__target = NULL; - SourceCollection* _tmp3_ = NULL; - SourceCollection* _tmp4_ = NULL; + SourceCollection* _tmp0_; + SourceCollection* _tmp1_; + SourceHoldingTankCheckToKeep _tmp2_; + void* _tmp2__target; + SourceCollection* _tmp3_; + SourceCollection* _tmp4_; #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" @@ -331,22 +336,22 @@ SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceColle 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); #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return self; -#line 335 "SourceHoldingTank.c" +#line 340 "SourceHoldingTank.c" } 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 342 "SourceHoldingTank.c" +#line 347 "SourceHoldingTank.c" } static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) { - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeCollection* _tmp16_ = NULL; - GeeCollection* _tmp17_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp8_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; #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" @@ -355,11 +360,11 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* _tmp0_ = added; #line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (_tmp0_ != NULL) { -#line 359 "SourceHoldingTank.c" +#line 364 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp1_ = added; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -368,13 +373,13 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* _source_it = _tmp2_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 372 "SourceHoldingTank.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 377 "SourceHoldingTank.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataSource* _tmp7_; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = _source_it; #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -383,7 +388,7 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* if (!_tmp4_) { #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 387 "SourceHoldingTank.c" +#line 392 "SourceHoldingTank.c" } #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp5_ = _source_it; @@ -397,22 +402,22 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* data_source_notify_held_in_tank (_tmp7_, self); #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 401 "SourceHoldingTank.c" +#line 406 "SourceHoldingTank.c" } #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 405 "SourceHoldingTank.c" +#line 410 "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 412 "SourceHoldingTank.c" +#line 417 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp9_ = removed; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -421,13 +426,13 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* _source_it = _tmp10_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 425 "SourceHoldingTank.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 430 "SourceHoldingTank.c" + GeeIterator* _tmp11_; + gboolean _tmp12_; DataSource* source = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - DataSource* _tmp15_ = NULL; + GeeIterator* _tmp13_; + gpointer _tmp14_; + DataSource* _tmp15_; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp11_ = _source_it; #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -436,7 +441,7 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* if (!_tmp12_) { #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 440 "SourceHoldingTank.c" +#line 445 "SourceHoldingTank.c" } #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp13_ = _source_it; @@ -450,11 +455,11 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* data_source_notify_held_in_tank (_tmp15_, NULL); #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 454 "SourceHoldingTank.c" +#line 459 "SourceHoldingTank.c" } #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 458 "SourceHoldingTank.c" +#line 463 "SourceHoldingTank.c" } } #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -462,8 +467,8 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* #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_by_name (self, "contents-altered", _tmp16_, _tmp17_); -#line 467 "SourceHoldingTank.c" + g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, _tmp16_, _tmp17_); +#line 472 "SourceHoldingTank.c" } @@ -472,14 +477,14 @@ void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCo 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 476 "SourceHoldingTank.c" +#line 481 "SourceHoldingTank.c" } gint source_holding_tank_get_count (SourceHoldingTank* self) { gint result = 0; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 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" @@ -490,14 +495,14 @@ gint source_holding_tank_get_count (SourceHoldingTank* self) { result = _tmp1_; #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 494 "SourceHoldingTank.c" +#line 499 "SourceHoldingTank.c" } GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) { GeeCollection* result = NULL; - DataSet* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + DataSet* _tmp0_; + GeeList* _tmp1_; #line 71 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), NULL); #line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -508,16 +513,16 @@ 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 512 "SourceHoldingTank.c" +#line 517 "SourceHoldingTank.c" } gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - DataSet* _tmp1_ = NULL; - DataSource* _tmp2_ = NULL; - gboolean _tmp3_ = 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" @@ -532,11 +537,11 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour if (_tmp3_) { #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = TRUE; -#line 536 "SourceHoldingTank.c" +#line 541 "SourceHoldingTank.c" } else { - GeeHashSet* _tmp4_ = NULL; - DataSource* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + 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" @@ -545,26 +550,26 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour _tmp6_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp0_ = _tmp6_; -#line 549 "SourceHoldingTank.c" +#line 554 "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 555 "SourceHoldingTank.c" +#line 560 "SourceHoldingTank.c" } void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) { - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; - GeeCollection* _tmp15_ = NULL; + DataSet* _tmp11_; + GeeCollection* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; + GeeCollection* _tmp15_; #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" @@ -579,12 +584,12 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) if (_tmp2_ == 0) { #line 82 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 583 "SourceHoldingTank.c" +#line 588 "SourceHoldingTank.c" } { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = many; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -593,14 +598,14 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) _source_it = _tmp4_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 597 "SourceHoldingTank.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 602 "SourceHoldingTank.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; DataSource* source = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataSource* _tmp9_; + gint64 _tmp10_; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp5_ = _source_it; #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -609,7 +614,7 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) if (!_tmp6_) { #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 613 "SourceHoldingTank.c" +#line 618 "SourceHoldingTank.c" } #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp7_ = _source_it; @@ -627,11 +632,11 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject), _tmp10_); #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 631 "SourceHoldingTank.c" +#line 636 "SourceHoldingTank.c" } #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 635 "SourceHoldingTank.c" +#line 640 "SourceHoldingTank.c" } #line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp11_ = self->priv->tank; @@ -649,31 +654,31 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) _tmp15_ = many; #line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_notify_contents_altered (self, _tmp15_, NULL); -#line 653 "SourceHoldingTank.c" +#line 658 "SourceHoldingTank.c" } void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink) { - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GeeHashSet* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - SourceCollection* _tmp5_ = NULL; - SourceCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - Marker* _tmp8_ = NULL; - Marker* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GeeHashSet* _tmp3_; + GeeCollection* _tmp4_; + SourceCollection* _tmp5_; + SourceCollection* _tmp6_; + GeeCollection* _tmp7_; + Marker* _tmp8_; + Marker* _tmp9_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; gboolean added = FALSE; - DataSet* _tmp20_ = NULL; - GeeCollection* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_ = FALSE; - GeeHashSet* _tmp24_ = NULL; - GeeCollection* _tmp25_ = NULL; - GeeCollection* _tmp26_ = NULL; + DataSet* _tmp20_; + GeeCollection* _tmp21_; + gboolean _tmp22_; + gboolean _tmp23_; + GeeHashSet* _tmp24_; + GeeCollection* _tmp25_; + GeeCollection* _tmp26_; #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" @@ -688,7 +693,7 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection if (_tmp2_ == 0) { #line 97 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 692 "SourceHoldingTank.c" +#line 697 "SourceHoldingTank.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = self->priv->unlinking; @@ -714,11 +719,11 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection _g_object_unref0 (_tmp11_); #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_tmp9_); -#line 718 "SourceHoldingTank.c" +#line 723 "SourceHoldingTank.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp12_ = unlink; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -727,14 +732,14 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection _source_it = _tmp13_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 731 "SourceHoldingTank.c" - GeeIterator* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; +#line 736 "SourceHoldingTank.c" + GeeIterator* _tmp14_; + gboolean _tmp15_; DataSource* source = NULL; - GeeIterator* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; - DataSource* _tmp18_ = NULL; - gint64 _tmp19_ = 0LL; + GeeIterator* _tmp16_; + gpointer _tmp17_; + DataSource* _tmp18_; + gint64 _tmp19_; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp14_ = _source_it; #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -743,7 +748,7 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection if (!_tmp15_) { #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 747 "SourceHoldingTank.c" +#line 752 "SourceHoldingTank.c" } #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp16_ = _source_it; @@ -761,11 +766,11 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), _tmp19_); #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 765 "SourceHoldingTank.c" +#line 770 "SourceHoldingTank.c" } #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_source_it); -#line 769 "SourceHoldingTank.c" +#line 774 "SourceHoldingTank.c" } #line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp20_ = self->priv->tank; @@ -789,15 +794,15 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection _tmp26_ = unlink; #line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_holding_tank_notify_contents_altered (self, _tmp26_, NULL); -#line 793 "SourceHoldingTank.c" +#line 798 "SourceHoldingTank.c" } gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink) { gboolean result = FALSE; gint count = 0; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 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" @@ -808,37 +813,37 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli _tmp1_ = data_set_get_count (_tmp0_); #line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" count = _tmp1_; -#line 812 "SourceHoldingTank.c" +#line 817 "SourceHoldingTank.c" { gint ctr = 0; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 817 "SourceHoldingTank.c" +#line 822 "SourceHoldingTank.c" { gboolean _tmp2_ = FALSE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp2_ = TRUE; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 824 "SourceHoldingTank.c" - gint _tmp4_ = 0; - gint _tmp5_ = 0; - DataSet* _tmp6_ = NULL; - gint _tmp7_ = 0; - DataObject* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - SourceBacklink* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; +#line 829 "SourceHoldingTank.c" + gint _tmp4_; + gint _tmp5_; + DataSet* _tmp6_; + gint _tmp7_; + DataObject* _tmp8_; + DataSource* _tmp9_; + SourceBacklink* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!_tmp2_) { -#line 836 "SourceHoldingTank.c" - gint _tmp3_ = 0; +#line 841 "SourceHoldingTank.c" + gint _tmp3_; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = ctr; #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = _tmp3_ + 1; -#line 842 "SourceHoldingTank.c" +#line 847 "SourceHoldingTank.c" } #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp2_ = FALSE; @@ -850,7 +855,7 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli if (!(_tmp4_ < _tmp5_)) { #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 854 "SourceHoldingTank.c" +#line 859 "SourceHoldingTank.c" } #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp6_ = self->priv->tank; @@ -874,7 +879,7 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli result = TRUE; #line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 878 "SourceHoldingTank.c" +#line 883 "SourceHoldingTank.c" } } } @@ -883,14 +888,14 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli result = FALSE; #line 123 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 887 "SourceHoldingTank.c" +#line 892 "SourceHoldingTank.c" } void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink) { gint count = 0; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 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" @@ -901,35 +906,35 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin _tmp1_ = data_set_get_count (_tmp0_); #line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" count = _tmp1_; -#line 905 "SourceHoldingTank.c" +#line 910 "SourceHoldingTank.c" { gint ctr = 0; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 910 "SourceHoldingTank.c" +#line 915 "SourceHoldingTank.c" { gboolean _tmp2_ = FALSE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp2_ = TRUE; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 917 "SourceHoldingTank.c" - gint _tmp4_ = 0; - gint _tmp5_ = 0; - DataSet* _tmp6_ = NULL; - gint _tmp7_ = 0; - DataObject* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - SourceBacklink* _tmp10_ = NULL; +#line 922 "SourceHoldingTank.c" + gint _tmp4_; + gint _tmp5_; + DataSet* _tmp6_; + gint _tmp7_; + DataObject* _tmp8_; + DataSource* _tmp9_; + SourceBacklink* _tmp10_; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!_tmp2_) { -#line 927 "SourceHoldingTank.c" - gint _tmp3_ = 0; +#line 932 "SourceHoldingTank.c" + gint _tmp3_; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = ctr; #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = _tmp3_ + 1; -#line 933 "SourceHoldingTank.c" +#line 938 "SourceHoldingTank.c" } #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp2_ = FALSE; @@ -941,7 +946,7 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin if (!(_tmp4_ < _tmp5_)) { #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 945 "SourceHoldingTank.c" +#line 950 "SourceHoldingTank.c" } #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp6_ = self->priv->tank; @@ -957,7 +962,7 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin data_source_remove_backlink (_tmp9_, _tmp10_); #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_tmp9_); -#line 961 "SourceHoldingTank.c" +#line 966 "SourceHoldingTank.c" } } } @@ -965,19 +970,19 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { - GeeList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeList* _tmp0_; + gint _tmp1_; + gint _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - GeeList* _tmp7_ = NULL; + DataSet* _tmp3_; + GeeList* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + GeeList* _tmp7_; gint count = 0; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + GeeList* _tmp8_; + gint _tmp9_; + gint _tmp10_; #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" @@ -994,7 +999,7 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest if (_tmp2_ == 0) { #line 135 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 998 "SourceHoldingTank.c" +#line 1003 "SourceHoldingTank.c" } #line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = self->priv->tank; @@ -1020,39 +1025,39 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest _tmp10_ = _tmp9_; #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" count = _tmp10_; -#line 1024 "SourceHoldingTank.c" +#line 1029 "SourceHoldingTank.c" { gint ctr = 0; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = 0; -#line 1029 "SourceHoldingTank.c" +#line 1034 "SourceHoldingTank.c" { gboolean _tmp11_ = FALSE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp11_ = TRUE; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" while (TRUE) { -#line 1036 "SourceHoldingTank.c" - gint _tmp13_ = 0; - gint _tmp14_ = 0; +#line 1041 "SourceHoldingTank.c" + gint _tmp13_; + gint _tmp14_; DataSource* source = NULL; - GeeList* _tmp15_ = NULL; - gint _tmp16_ = 0; - gpointer _tmp17_ = NULL; - DataSource* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - ProgressMonitor _tmp24_ = NULL; - void* _tmp24__target = NULL; + GeeList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + DataSource* _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; + ProgressMonitor _tmp24_; + void* _tmp24__target; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!_tmp11_) { -#line 1050 "SourceHoldingTank.c" - gint _tmp12_ = 0; +#line 1055 "SourceHoldingTank.c" + gint _tmp12_; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp12_ = ctr; #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ctr = _tmp12_ + 1; -#line 1056 "SourceHoldingTank.c" +#line 1061 "SourceHoldingTank.c" } #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp11_ = FALSE; @@ -1064,7 +1069,7 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest if (!(_tmp13_ < _tmp14_)) { #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" break; -#line 1068 "SourceHoldingTank.c" +#line 1073 "SourceHoldingTank.c" } #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp15_ = destroy; @@ -1082,22 +1087,22 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest _tmp20_ = data_source_destroy_orphan (_tmp18_, _tmp19_); #line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (!_tmp20_) { -#line 1086 "SourceHoldingTank.c" - GeeList* _tmp21_ = NULL; +#line 1091 "SourceHoldingTank.c" + GeeList* _tmp21_; #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 1092 "SourceHoldingTank.c" - GeeList* _tmp22_ = NULL; - DataSource* _tmp23_ = NULL; +#line 1097 "SourceHoldingTank.c" + GeeList* _tmp22_; + DataSource* _tmp23_; #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp22_ = not_removed; #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp23_ = 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 1101 "SourceHoldingTank.c" +#line 1106 "SourceHoldingTank.c" } } #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1106,11 +1111,11 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest _tmp24__target = monitor_target; #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (_tmp24_ != NULL) { -#line 1110 "SourceHoldingTank.c" - ProgressMonitor _tmp25_ = NULL; - void* _tmp25__target = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; +#line 1115 "SourceHoldingTank.c" + ProgressMonitor _tmp25_; + void* _tmp25__target; + gint _tmp26_; + gint _tmp27_; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp25_ = monitor; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1121,11 +1126,11 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest _tmp27_ = count; #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp25_ ((guint64) (_tmp26_ + 1), (guint64) _tmp27_, TRUE, _tmp25__target); -#line 1125 "SourceHoldingTank.c" +#line 1130 "SourceHoldingTank.c" } #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (source); -#line 1129 "SourceHoldingTank.c" +#line 1134 "SourceHoldingTank.c" } } } @@ -1133,17 +1138,17 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source) { - DataSet* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + DataSet* _tmp0_; + DataSource* _tmp1_; + gboolean _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_ = NULL; - DataSource* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - DataSource* _tmp7_ = NULL; - SingletonCollection* _tmp8_ = NULL; - SingletonCollection* _tmp9_ = NULL; + DataSet* _tmp3_; + DataSource* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + DataSource* _tmp7_; + SingletonCollection* _tmp8_; + SingletonCollection* _tmp9_; #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" @@ -1158,7 +1163,7 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da if (!_tmp2_) { #line 157 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1162 "SourceHoldingTank.c" +#line 1167 "SourceHoldingTank.c" } #line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = self->priv->tank; @@ -1182,31 +1187,31 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _g_object_unref0 (_tmp9_); -#line 1186 "SourceHoldingTank.c" +#line 1191 "SourceHoldingTank.c" } void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration) { - DataSet* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - SourceHoldingTankCheckToKeep _tmp8_ = NULL; - void* _tmp8__target = NULL; - DataSource* _tmp9_ = NULL; - Alteration* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + DataSet* _tmp0_; + DataSource* _tmp1_; + gboolean _tmp2_; + SourceHoldingTankCheckToKeep _tmp8_; + void* _tmp8__target; + DataSource* _tmp9_; + Alteration* _tmp10_; + gboolean _tmp11_; gboolean removed = FALSE; - DataSet* _tmp12_ = NULL; - DataSource* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - SourceCollection* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - DataSource* _tmp20_ = NULL; - SingletonCollection* _tmp21_ = NULL; - SingletonCollection* _tmp22_ = NULL; - SourceCollection* _tmp23_ = NULL; - DataSource* _tmp24_ = NULL; + DataSet* _tmp12_; + DataSource* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; + SourceCollection* _tmp16_; + gboolean _tmp17_; + DataSource* _tmp20_; + SingletonCollection* _tmp21_; + SingletonCollection* _tmp22_; + SourceCollection* _tmp23_; + DataSource* _tmp24_; #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,12 +1226,12 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS _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 1225 "SourceHoldingTank.c" - DataSource* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; +#line 1230 "SourceHoldingTank.c" + DataSource* _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" @@ -1246,7 +1251,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS _g_free0 (_tmp5_); #line 171 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1249 "SourceHoldingTank.c" +#line 1254 "SourceHoldingTank.c" } #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp8_ = self->priv->check_to_keep; @@ -1262,7 +1267,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS if (_tmp11_) { #line 176 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1265 "SourceHoldingTank.c" +#line 1270 "SourceHoldingTank.c" } #line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp12_ = self->priv->tank; @@ -1282,9 +1287,9 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS _tmp17_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection)); #line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (_tmp17_) { -#line 1285 "SourceHoldingTank.c" - GeeHashSet* _tmp18_ = NULL; - DataSource* _tmp19_ = NULL; +#line 1290 "SourceHoldingTank.c" + GeeHashSet* _tmp18_; + DataSource* _tmp19_; #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp18_ = self->priv->relinks; #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1293,7 +1298,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); #line 184 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return; -#line 1296 "SourceHoldingTank.c" +#line 1301 "SourceHoldingTank.c" } #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp20_ = source; @@ -1311,28 +1316,28 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS _tmp24_ = source; #line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" source_collection_relink (_tmp23_, _tmp24_); -#line 1314 "SourceHoldingTank.c" +#line 1319 "SourceHoldingTank.c" } 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 1321 "SourceHoldingTank.c" +#line 1326 "SourceHoldingTank.c" } static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) { - GeeHashSet* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeHashSet* _tmp0_; + gint _tmp1_; + gint _tmp2_; GeeHashSet* copy = NULL; - GeeHashSet* _tmp3_ = NULL; - GeeHashSet* _tmp4_ = NULL; - GeeHashSet* _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; - SourceCollection* _tmp7_ = NULL; - GeeHashSet* _tmp8_ = NULL; + GeeHashSet* _tmp3_; + GeeHashSet* _tmp4_; + GeeHashSet* _tmp5_; + GeeHashSet* _tmp6_; + SourceCollection* _tmp7_; + GeeHashSet* _tmp8_; #line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_if_fail (IS_SOURCE_HOLDING_TANK (self)); #line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1345,7 +1350,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 1348 "SourceHoldingTank.c" +#line 1353 "SourceHoldingTank.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" _tmp3_ = self->priv->relinks; @@ -1371,13 +1376,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 1374 "SourceHoldingTank.c" +#line 1379 "SourceHoldingTank.c" } gchar* source_holding_tank_to_string (SourceHoldingTank* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 205 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), NULL); #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1386,7 +1391,7 @@ gchar* source_holding_tank_to_string (SourceHoldingTank* self) { result = _tmp0_; #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return result; -#line 1389 "SourceHoldingTank.c" +#line 1394 "SourceHoldingTank.c" } @@ -1395,7 +1400,7 @@ static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, 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 1398 "SourceHoldingTank.c" +#line 1403 "SourceHoldingTank.c" } @@ -1414,26 +1419,26 @@ 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 1417 "SourceHoldingTank.c" +#line 1422 "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 1423 "SourceHoldingTank.c" +#line 1428 "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 1429 "SourceHoldingTank.c" +#line 1434 "SourceHoldingTank.c" } 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 1436 "SourceHoldingTank.c" +#line 1441 "SourceHoldingTank.c" } @@ -1442,7 +1447,7 @@ static void value_source_holding_tank_free_value (GValue* value) { 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 1445 "SourceHoldingTank.c" +#line 1450 "SourceHoldingTank.c" } } @@ -1452,11 +1457,11 @@ static void value_source_holding_tank_copy_value (const GValue* src_value, GValu 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 1455 "SourceHoldingTank.c" +#line 1460 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" dest_value->data[0].v_pointer = NULL; -#line 1459 "SourceHoldingTank.c" +#line 1464 "SourceHoldingTank.c" } } @@ -1464,66 +1469,66 @@ static void value_source_holding_tank_copy_value (const GValue* src_value, GValu 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 1467 "SourceHoldingTank.c" +#line 1472 "SourceHoldingTank.c" } 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 1474 "SourceHoldingTank.c" - SourceHoldingTank* object; +#line 1479 "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 1481 "SourceHoldingTank.c" +#line 1486 "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 1485 "SourceHoldingTank.c" +#line 1490 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = source_holding_tank_ref (object); -#line 1489 "SourceHoldingTank.c" +#line 1494 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1493 "SourceHoldingTank.c" +#line 1498 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return NULL; -#line 1497 "SourceHoldingTank.c" +#line 1502 "SourceHoldingTank.c" } static gchar* value_source_holding_tank_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SourceHoldingTank** object_p; + 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 1508 "SourceHoldingTank.c" +#line 1513 "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 1514 "SourceHoldingTank.c" +#line 1519 "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 1518 "SourceHoldingTank.c" +#line 1523 "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 1522 "SourceHoldingTank.c" +#line 1527 "SourceHoldingTank.c" } #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return NULL; -#line 1526 "SourceHoldingTank.c" +#line 1531 "SourceHoldingTank.c" } @@ -1537,7 +1542,7 @@ 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 1540 "SourceHoldingTank.c" +#line 1545 "SourceHoldingTank.c" } @@ -1546,12 +1551,12 @@ gpointer value_get_source_holding_tank (const GValue* value) { 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 1549 "SourceHoldingTank.c" +#line 1554 "SourceHoldingTank.c" } void value_set_source_holding_tank (GValue* value, gpointer v_object) { - SourceHoldingTank* old; + 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)); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1566,23 +1571,23 @@ 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 1569 "SourceHoldingTank.c" +#line 1574 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1573 "SourceHoldingTank.c" +#line 1578 "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 1579 "SourceHoldingTank.c" +#line 1584 "SourceHoldingTank.c" } } void value_take_source_holding_tank (GValue* value, gpointer v_object) { - SourceHoldingTank* old; + 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)); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1595,17 +1600,17 @@ 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 1598 "SourceHoldingTank.c" +#line 1603 "SourceHoldingTank.c" } else { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" value->data[0].v_pointer = NULL; -#line 1602 "SourceHoldingTank.c" +#line 1607 "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 1608 "SourceHoldingTank.c" +#line 1613 "SourceHoldingTank.c" } } @@ -1618,19 +1623,19 @@ static void source_holding_tank_class_init (SourceHoldingTankClass * klass) { #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_type_class_add_private (klass, sizeof (SourceHoldingTankPrivate)); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) source_holding_tank_real_notify_contents_altered; + ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) source_holding_tank_real_notify_contents_altered; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" ((SourceHoldingTankClass *) klass)->contents_altered = source_holding_tank_real_contents_altered; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" - 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 1626 "SourceHoldingTank.c" + 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" } static void source_holding_tank_instance_init (SourceHoldingTank * self) { - DataSet* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; - GeeHashSet* _tmp2_ = NULL; + DataSet* _tmp0_; + GeeHashSet* _tmp1_; + GeeHashSet* _tmp2_; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" self->priv = SOURCE_HOLDING_TANK_GET_PRIVATE (self); #line 30 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1649,16 +1654,16 @@ 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 1652 "SourceHoldingTank.c" +#line 1657 "SourceHoldingTank.c" } -static void source_holding_tank_finalize (SourceHoldingTank* obj) { +static void source_holding_tank_finalize (SourceHoldingTank * obj) { SourceHoldingTank * self; - SourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; - SourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; + SourceCollection* _tmp0_; + guint _tmp1_; + SourceCollection* _tmp2_; + guint _tmp3_; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" @@ -1683,7 +1688,7 @@ 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 1686 "SourceHoldingTank.c" +#line 1691 "SourceHoldingTank.c" } @@ -1702,18 +1707,18 @@ GType source_holding_tank_get_type (void) { gpointer source_holding_tank_ref (gpointer instance) { - SourceHoldingTank* self; + SourceHoldingTank * self; self = instance; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" g_atomic_int_inc (&self->ref_count); #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" return instance; -#line 1711 "SourceHoldingTank.c" +#line 1716 "SourceHoldingTank.c" } void source_holding_tank_unref (gpointer instance) { - SourceHoldingTank* self; + SourceHoldingTank * self; self = instance; #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1721,7 +1726,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 1724 "SourceHoldingTank.c" +#line 1729 "SourceHoldingTank.c" } } diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c index f65f3e2..cc43f4e 100644 --- a/src/core/SourceInterfaces.c +++ b/src/core/SourceInterfaces.c @@ -1,4 +1,4 @@ -/* SourceInterfaces.c generated by valac 0.34.7, the Vala compiler +/* SourceInterfaces.c generated by valac 0.36.6, the Vala compiler * generated from SourceInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -80,13 +80,13 @@ const gchar* indexable_get_indexable_keywords (Indexable* self) { gchar* indexable_prepare_indexable_string (const gchar* str) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp0_; + gboolean _tmp1_; + const 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" @@ -122,16 +122,16 @@ gchar* indexable_prepare_indexable_string (const gchar* str) { gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { gchar* result = NULL; gboolean _tmp0_ = FALSE; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp1_; + gint _tmp1__length1; GString* builder = NULL; - GString* _tmp3_ = NULL; + GString* _tmp3_; gint ctr = 0; const gchar* _tmp21_ = NULL; - GString* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - gchar* _tmp27_ = NULL; + GString* _tmp22_; + const gchar* _tmp23_; + gboolean _tmp24_; + gchar* _tmp27_; #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" _tmp1_ = strs; #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" @@ -142,8 +142,8 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { _tmp0_ = TRUE; #line 144 "SourceInterfaces.c" } else { - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + 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" @@ -174,18 +174,18 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" while (TRUE) { #line 177 "SourceInterfaces.c" - gchar** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - const gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + gchar** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (!_tmp4_) { #line 185 "SourceInterfaces.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + 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" @@ -218,16 +218,16 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (!_tmp11_) { #line 221 "SourceInterfaces.c" - GString* _tmp12_ = NULL; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - gint _tmp14_ = 0; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gint _tmp18_ = 0; - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; + 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" @@ -255,7 +255,7 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { #line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (_tmp18_ < (_tmp19__length1 - 1)) { #line 258 "SourceInterfaces.c" - GString* _tmp20_ = NULL; + GString* _tmp20_; #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" _tmp20_ = builder; #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" @@ -274,8 +274,8 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) { #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" if (!_tmp24_) { #line 277 "SourceInterfaces.c" - GString* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; + GString* _tmp25_; + const gchar* _tmp26_; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" _tmp25_ = builder; #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala" diff --git a/src/core/Tracker.c b/src/core/Tracker.c index 93794c0..ff1dc00 100644 --- a/src/core/Tracker.c +++ b/src/core/Tracker.c @@ -1,4 +1,4 @@ -/* Tracker.c generated by valac 0.34.7, the Vala compiler +/* Tracker.c generated by valac 0.36.6, the Vala compiler * generated from Tracker.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -65,6 +65,11 @@ typedef struct _DataCollectionClass DataCollectionClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) typedef struct _CoreParamSpecTracker CoreParamSpecTracker; +enum { + CORE_TRACKER_UPDATED_SIGNAL, + CORE_TRACKER_LAST_SIGNAL +}; +static guint core_tracker_signals[CORE_TRACKER_LAST_SIGNAL] = {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)) @@ -171,7 +176,7 @@ struct _CoreViewTrackerMuxClass { static gpointer core_tracker_parent_class = NULL; static gpointer core_view_tracker_parent_class = NULL; static gpointer core_view_tracker_mux_parent_class = NULL; -static CoreTrackerAccumulatorIface* core_view_tracker_mux_core_tracker_accumulator_parent_iface = NULL; +static CoreTrackerAccumulatorIface * core_view_tracker_mux_core_tracker_accumulator_parent_iface = NULL; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); @@ -218,7 +223,7 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co 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); +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)) @@ -249,8 +254,8 @@ 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 void core_view_tracker_mux_finalize (GObject* obj); -static void core_view_tracker_finalize (CoreTracker* obj); +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) { @@ -258,7 +263,7 @@ gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObj 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 262 "Tracker.c" +#line 267 "Tracker.c" } @@ -267,7 +272,7 @@ gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, DataO 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 271 "Tracker.c" +#line 276 "Tracker.c" } @@ -276,7 +281,7 @@ gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, DataObj 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 280 "Tracker.c" +#line 285 "Tracker.c" } @@ -287,7 +292,7 @@ static void core_tracker_accumulator_base_init (CoreTrackerAccumulatorIface * if if (!initialized) { #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala" initialized = TRUE; -#line 291 "Tracker.c" +#line 296 "Tracker.c" } } @@ -308,44 +313,44 @@ GType core_tracker_accumulator_get_type (void) { 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 312 "Tracker.c" +#line 317 "Tracker.c" } 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 319 "Tracker.c" +#line 324 "Tracker.c" } 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 326 "Tracker.c" +#line 331 "Tracker.c" } 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 333 "Tracker.c" +#line 338 "Tracker.c" } 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 340 "Tracker.c" +#line 345 "Tracker.c" } CoreTracker* core_tracker_construct (GType object_type, DataCollection* collection, GeeCollection* initial) { CoreTracker* self = NULL; - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; + DataCollection* _tmp0_; + DataCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; #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" @@ -370,26 +375,26 @@ CoreTracker* core_tracker_construct (GType object_type, DataCollection* collecti self->priv->initial = _tmp3_; #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 374 "Tracker.c" +#line 379 "Tracker.c" } 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 381 "Tracker.c" +#line 386 "Tracker.c" } void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { - CoreTrackerAccumulator* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; - CoreTrackerAccumulator* _tmp2_ = NULL; - DataCollection* _tmp3_ = NULL; - DataCollection* _tmp4_ = NULL; - DataCollection* _tmp5_ = NULL; + CoreTrackerAccumulator* _tmp0_; + CoreTrackerAccumulator* _tmp1_; + CoreTrackerAccumulator* _tmp2_; + DataCollection* _tmp3_; + DataCollection* _tmp4_; + DataCollection* _tmp5_; gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_ = NULL; + GeeCollection* _tmp7_; #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" @@ -422,10 +427,10 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { _tmp7_ = self->priv->initial; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp7_ != NULL) { -#line 426 "Tracker.c" - GeeCollection* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; +#line 431 "Tracker.c" + GeeCollection* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp8_ = self->priv->initial; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -434,31 +439,31 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { _tmp10_ = _tmp9_; #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp6_ = _tmp10_ > 0; -#line 438 "Tracker.c" +#line 443 "Tracker.c" } else { #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp6_ = FALSE; -#line 442 "Tracker.c" +#line 447 "Tracker.c" } #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp6_) { -#line 446 "Tracker.c" - GeeCollection* _tmp11_ = NULL; +#line 451 "Tracker.c" + GeeCollection* _tmp11_; #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp11_ = 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 452 "Tracker.c" +#line 457 "Tracker.c" } else { - GeeCollection* _tmp12_ = NULL; + GeeCollection* _tmp12_; #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp12_ = self->priv->initial; #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp12_ == NULL) { -#line 459 "Tracker.c" - DataCollection* _tmp13_ = NULL; - GeeCollection* _tmp14_ = NULL; - GeeCollection* _tmp15_ = NULL; +#line 464 "Tracker.c" + DataCollection* _tmp13_; + GeeCollection* _tmp14_; + GeeCollection* _tmp15_; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp13_ = self->priv->collection; #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -469,21 +474,21 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) { core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable)); #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (_tmp15_); -#line 473 "Tracker.c" +#line 478 "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 480 "Tracker.c" +#line 485 "Tracker.c" } DataCollection* core_tracker_get_collection (CoreTracker* self) { DataCollection* result = NULL; - DataCollection* _tmp0_ = NULL; - DataCollection* _tmp1_ = NULL; + DataCollection* _tmp0_; + DataCollection* _tmp1_; #line 64 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_val_if_fail (CORE_IS_TRACKER (self), NULL); #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -494,7 +499,7 @@ DataCollection* core_tracker_get_collection (CoreTracker* self) { result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 498 "Tracker.c" +#line 503 "Tracker.c" } @@ -503,13 +508,13 @@ static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude result = core_tracker_accumulator_include ((CoreTrackerAccumulator*) self, object); #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 507 "Tracker.c" +#line 512 "Tracker.c" } static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added) { - GeeIterable* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + CoreTrackerAccumulator* _tmp1_; #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" @@ -520,7 +525,7 @@ static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added) _tmp1_ = 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 524 "Tracker.c" +#line 529 "Tracker.c" } @@ -529,13 +534,13 @@ static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclu result = core_tracker_accumulator_uninclude ((CoreTrackerAccumulator*) self, object); #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala" return result; -#line 533 "Tracker.c" +#line 538 "Tracker.c" } static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* removed) { - GeeIterable* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + CoreTrackerAccumulator* _tmp1_; #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" @@ -546,24 +551,24 @@ static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* remov _tmp1_ = 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 550 "Tracker.c" +#line 555 "Tracker.c" } void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, CoreTrackerIncludeUnincludeObject cb, void* cb_target) { gboolean fire_updated = FALSE; - gboolean _tmp11_ = FALSE; + gboolean _tmp11_; #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 563 "Tracker.c" +#line 568 "Tracker.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp0_ = objects; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -572,17 +577,17 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co _object_it = _tmp1_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" while (TRUE) { -#line 576 "Tracker.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 581 "Tracker.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; gboolean _tmp6_ = FALSE; - CoreTrackerIncludeUnincludeObject _tmp7_ = NULL; - void* _tmp7__target = NULL; - DataObject* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + CoreTrackerIncludeUnincludeObject _tmp7_; + void* _tmp7__target; + DataObject* _tmp8_; + gboolean _tmp9_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp2_ = _object_it; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -591,7 +596,7 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co if (!_tmp3_) { #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" break; -#line 595 "Tracker.c" +#line 600 "Tracker.c" } #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp4_ = _object_it; @@ -611,54 +616,54 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co if (_tmp9_) { #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp6_ = TRUE; -#line 615 "Tracker.c" +#line 620 "Tracker.c" } else { - gboolean _tmp10_ = FALSE; + gboolean _tmp10_; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp10_ = fire_updated; #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp6_ = _tmp10_; -#line 622 "Tracker.c" +#line 627 "Tracker.c" } #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp6_; #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (object); -#line 628 "Tracker.c" +#line 633 "Tracker.c" } #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (_object_it); -#line 632 "Tracker.c" +#line 637 "Tracker.c" } #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp11_ = fire_updated; #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp11_) { #line 83 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_emit_by_name (self, "updated"); -#line 640 "Tracker.c" + g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0); +#line 645 "Tracker.c" } } static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) { gboolean fire_updated = FALSE; - gboolean _tmp20_ = FALSE; + gboolean _tmp20_; #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 654 "Tracker.c" +#line 659 "Tracker.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp0_ = map; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -677,21 +682,21 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) { _object_it = _tmp5_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" while (TRUE) { -#line 681 "Tracker.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 686 "Tracker.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; gboolean _tmp10_ = FALSE; - CoreTrackerAccumulator* _tmp11_ = NULL; - DataObject* _tmp12_ = NULL; - GeeMap* _tmp13_ = NULL; - DataObject* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; - Alteration* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - gboolean _tmp18_ = 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; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -700,7 +705,7 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) { if (!_tmp7_) { #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" break; -#line 704 "Tracker.c" +#line 709 "Tracker.c" } #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp8_ = _object_it; @@ -730,32 +735,32 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) { if (_tmp18_) { #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp10_ = TRUE; -#line 734 "Tracker.c" +#line 739 "Tracker.c" } else { - gboolean _tmp19_ = FALSE; + gboolean _tmp19_; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp19_ = fire_updated; #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp10_ = _tmp19_; -#line 741 "Tracker.c" +#line 746 "Tracker.c" } #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp10_; #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (object); -#line 747 "Tracker.c" +#line 752 "Tracker.c" } #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala" _g_object_unref0 (_object_it); -#line 751 "Tracker.c" +#line 756 "Tracker.c" } #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp20_ = fire_updated; #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp20_) { #line 92 "/home/jens/Source/shotwell/src/core/Tracker.vala" - g_signal_emit_by_name (self, "updated"); -#line 759 "Tracker.c" + g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0); +#line 764 "Tracker.c" } } @@ -767,7 +772,7 @@ static void core_tracker_real_updated (CoreTracker* self) { 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 771 "Tracker.c" +#line 776 "Tracker.c" } @@ -776,7 +781,7 @@ static void core_value_tracker_free_value (GValue* value) { 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 780 "Tracker.c" +#line 785 "Tracker.c" } } @@ -786,11 +791,11 @@ static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest 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 790 "Tracker.c" +#line 795 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" dest_value->data[0].v_pointer = NULL; -#line 794 "Tracker.c" +#line 799 "Tracker.c" } } @@ -798,66 +803,66 @@ static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest 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 802 "Tracker.c" +#line 807 "Tracker.c" } 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 809 "Tracker.c" - CoreTracker* object; +#line 814 "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 816 "Tracker.c" +#line 821 "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 820 "Tracker.c" +#line 825 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = core_tracker_ref (object); -#line 824 "Tracker.c" +#line 829 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 828 "Tracker.c" +#line 833 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return NULL; -#line 832 "Tracker.c" +#line 837 "Tracker.c" } static gchar* core_value_tracker_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - CoreTracker** object_p; + 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 843 "Tracker.c" +#line 848 "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 849 "Tracker.c" +#line 854 "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 853 "Tracker.c" +#line 858 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" *object_p = core_tracker_ref (value->data[0].v_pointer); -#line 857 "Tracker.c" +#line 862 "Tracker.c" } #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" return NULL; -#line 861 "Tracker.c" +#line 866 "Tracker.c" } @@ -871,7 +876,7 @@ 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 875 "Tracker.c" +#line 880 "Tracker.c" } @@ -880,12 +885,12 @@ gpointer core_value_get_tracker (const GValue* value) { 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 884 "Tracker.c" +#line 889 "Tracker.c" } void core_value_set_tracker (GValue* value, gpointer v_object) { - CoreTracker* old; + 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)); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -900,23 +905,23 @@ 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 904 "Tracker.c" +#line 909 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 908 "Tracker.c" +#line 913 "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 914 "Tracker.c" +#line 919 "Tracker.c" } } void core_value_take_tracker (GValue* value, gpointer v_object) { - CoreTracker* old; + 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)); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -929,17 +934,17 @@ 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 933 "Tracker.c" +#line 938 "Tracker.c" } else { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" value->data[0].v_pointer = NULL; -#line 937 "Tracker.c" +#line 942 "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 943 "Tracker.c" +#line 948 "Tracker.c" } } @@ -954,8 +959,8 @@ static void core_tracker_class_init (CoreTrackerClass * klass) { #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" ((CoreTrackerClass *) klass)->updated = core_tracker_real_updated; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" - 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 959 "Tracker.c" + 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" } @@ -966,13 +971,13 @@ static void core_tracker_instance_init (CoreTracker * self) { self->priv->acc = NULL; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->ref_count = 1; -#line 970 "Tracker.c" +#line 975 "Tracker.c" } -static void core_tracker_finalize (CoreTracker* obj) { +static void core_tracker_finalize (CoreTracker * obj) { CoreTracker * self; - CoreTrackerAccumulator* _tmp0_ = NULL; + CoreTrackerAccumulator* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_TYPE_TRACKER, CoreTracker); #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -981,13 +986,13 @@ 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 985 "Tracker.c" - DataCollection* _tmp1_ = NULL; - guint _tmp2_ = 0U; - DataCollection* _tmp3_ = NULL; - guint _tmp4_ = 0U; - DataCollection* _tmp5_ = NULL; - guint _tmp6_ = 0U; +#line 990 "Tracker.c" + DataCollection* _tmp1_; + guint _tmp2_; + DataCollection* _tmp3_; + guint _tmp4_; + DataCollection* _tmp5_; + guint _tmp6_; #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp1_ = self->priv->collection; #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1006,7 +1011,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 1010 "Tracker.c" +#line 1015 "Tracker.c" } #line 26 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (self->priv->collection); @@ -1014,7 +1019,7 @@ 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 1018 "Tracker.c" +#line 1023 "Tracker.c" } @@ -1033,18 +1038,18 @@ GType core_tracker_get_type (void) { gpointer core_tracker_ref (gpointer instance) { - CoreTracker* self; + 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 1043 "Tracker.c" +#line 1048 "Tracker.c" } void core_tracker_unref (gpointer instance) { - CoreTracker* self; + CoreTracker * self; self = instance; #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1052,7 +1057,7 @@ 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 1056 "Tracker.c" +#line 1061 "Tracker.c" } } @@ -1060,37 +1065,37 @@ void core_tracker_unref (gpointer instance) { 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 1064 "Tracker.c" +#line 1069 "Tracker.c" } 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 1071 "Tracker.c" +#line 1076 "Tracker.c" } 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 1078 "Tracker.c" +#line 1083 "Tracker.c" } 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 1085 "Tracker.c" +#line 1090 "Tracker.c" } CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection) { CoreViewTracker* self = NULL; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; #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" @@ -1107,27 +1112,27 @@ CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* _g_object_unref0 (_tmp3_); #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 1111 "Tracker.c" +#line 1116 "Tracker.c" } 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 1118 "Tracker.c" +#line 1123 "Tracker.c" } void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { - CoreViewTrackerMux* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; - CoreTrackerAccumulator* _tmp2_ = NULL; - CoreTrackerAccumulator* _tmp3_ = NULL; - CoreViewTrackerMux* _tmp4_ = NULL; + CoreViewTrackerMux* _tmp0_; + CoreTrackerAccumulator* _tmp1_; + CoreTrackerAccumulator* _tmp2_; + CoreTrackerAccumulator* _tmp3_; + CoreViewTrackerMux* _tmp4_; ViewCollection* collection = NULL; - DataCollection* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - CoreViewTrackerMux* _tmp7_ = NULL; + DataCollection* _tmp5_; + ViewCollection* _tmp6_; + CoreViewTrackerMux* _tmp7_; #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" @@ -1160,7 +1165,7 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all if (_tmp6_ == NULL) { #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (_tmp5_); -#line 1164 "Tracker.c" +#line 1169 "Tracker.c" } #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala" collection = _tmp6_; @@ -1180,13 +1185,13 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all core_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator)); #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala" _data_collection_unref0 (collection); -#line 1184 "Tracker.c" +#line 1189 "Tracker.c" } static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollection* shown) { - CoreViewTrackerMux* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; + CoreViewTrackerMux* _tmp0_; + CoreTrackerAccumulator* _tmp1_; #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_VIEW_TRACKER (self)); #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1197,10 +1202,10 @@ 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 1201 "Tracker.c" - GeeCollection* _tmp2_ = NULL; - CoreViewTrackerMux* _tmp3_ = NULL; - CoreTrackerAccumulator* _tmp4_ = NULL; +#line 1206 "Tracker.c" + GeeCollection* _tmp2_; + CoreViewTrackerMux* _tmp3_; + CoreTrackerAccumulator* _tmp4_; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp2_ = shown; #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1209,14 +1214,14 @@ static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollecti _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 1213 "Tracker.c" +#line 1218 "Tracker.c" } } static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollection* hidden) { - CoreViewTrackerMux* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; + CoreViewTrackerMux* _tmp0_; + CoreTrackerAccumulator* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_VIEW_TRACKER (self)); #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1227,10 +1232,10 @@ 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 1231 "Tracker.c" - GeeCollection* _tmp2_ = NULL; - CoreViewTrackerMux* _tmp3_ = NULL; - CoreTrackerAccumulator* _tmp4_ = NULL; +#line 1236 "Tracker.c" + GeeCollection* _tmp2_; + CoreViewTrackerMux* _tmp3_; + CoreTrackerAccumulator* _tmp4_; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp2_ = hidden; #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1239,14 +1244,14 @@ static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollect _tmp4_ = _tmp3_->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 1243 "Tracker.c" +#line 1248 "Tracker.c" } } static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeIterable* selected) { - CoreViewTrackerMux* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; + CoreViewTrackerMux* _tmp0_; + CoreTrackerAccumulator* _tmp1_; #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_VIEW_TRACKER (self)); #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1257,10 +1262,10 @@ 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 1261 "Tracker.c" - GeeIterable* _tmp2_ = NULL; - CoreViewTrackerMux* _tmp3_ = NULL; - CoreTrackerAccumulator* _tmp4_ = NULL; +#line 1266 "Tracker.c" + GeeIterable* _tmp2_; + CoreViewTrackerMux* _tmp3_; + CoreTrackerAccumulator* _tmp4_; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp2_ = selected; #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1269,14 +1274,14 @@ static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeItera _tmp4_ = _tmp3_->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 1273 "Tracker.c" +#line 1278 "Tracker.c" } } static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIterable* unselected) { - CoreViewTrackerMux* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; + CoreViewTrackerMux* _tmp0_; + CoreTrackerAccumulator* _tmp1_; #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala" g_return_if_fail (CORE_IS_VIEW_TRACKER (self)); #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1287,10 +1292,10 @@ 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 1291 "Tracker.c" - GeeIterable* _tmp2_ = NULL; - CoreViewTrackerMux* _tmp3_ = NULL; - CoreTrackerAccumulator* _tmp4_ = NULL; +#line 1296 "Tracker.c" + GeeIterable* _tmp2_; + CoreViewTrackerMux* _tmp3_; + CoreTrackerAccumulator* _tmp4_; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp2_ = unselected; #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1299,19 +1304,19 @@ static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIte _tmp4_ = _tmp3_->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 1303 "Tracker.c" +#line 1308 "Tracker.c" } } static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) { CoreViewTrackerMux * self = NULL; - CoreTrackerAccumulator* _tmp0_ = NULL; - CoreTrackerAccumulator* _tmp1_ = NULL; - CoreTrackerAccumulator* _tmp2_ = NULL; - CoreTrackerAccumulator* _tmp3_ = NULL; - CoreTrackerAccumulator* _tmp4_ = NULL; - CoreTrackerAccumulator* _tmp5_ = 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" @@ -1346,14 +1351,14 @@ static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, C self->selected = _tmp5_; #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala" return self; -#line 1350 "Tracker.c" +#line 1355 "Tracker.c" } 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 1357 "Tracker.c" +#line 1362 "Tracker.c" } @@ -1361,14 +1366,14 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; + DataObject* _tmp0_; + DataView* _tmp1_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_ = NULL; + CoreTrackerAccumulator* _tmp2_; gboolean _tmp8_ = FALSE; - CoreTrackerAccumulator* _tmp9_ = NULL; + CoreTrackerAccumulator* _tmp9_; gboolean _tmp17_ = FALSE; - CoreTrackerAccumulator* _tmp18_ = NULL; + CoreTrackerAccumulator* _tmp18_; #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" @@ -1385,11 +1390,11 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base _tmp2_ = self->all; #line 116 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp2_ != NULL) { -#line 1389 "Tracker.c" +#line 1394 "Tracker.c" gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_ = NULL; - DataView* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp4_; + DataView* _tmp5_; + gboolean _tmp6_; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp4_ = self->all; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1400,45 +1405,45 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base if (_tmp6_) { #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp3_ = TRUE; -#line 1404 "Tracker.c" +#line 1409 "Tracker.c" } else { - gboolean _tmp7_ = FALSE; + gboolean _tmp7_; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp7_ = fire_updated; #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp3_ = _tmp7_; -#line 1411 "Tracker.c" +#line 1416 "Tracker.c" } #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp3_; -#line 1415 "Tracker.c" +#line 1420 "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 1421 "Tracker.c" - DataView* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; +#line 1426 "Tracker.c" + DataView* _tmp10_; + gboolean _tmp11_; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp10_ = view; #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp11_ = data_view_is_visible (_tmp10_); #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp8_ = _tmp11_; -#line 1430 "Tracker.c" +#line 1435 "Tracker.c" } else { #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp8_ = FALSE; -#line 1434 "Tracker.c" +#line 1439 "Tracker.c" } #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp8_) { -#line 1438 "Tracker.c" +#line 1443 "Tracker.c" gboolean _tmp12_ = FALSE; - CoreTrackerAccumulator* _tmp13_ = NULL; - DataView* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + CoreTrackerAccumulator* _tmp13_; + DataView* _tmp14_; + gboolean _tmp15_; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp13_ = self->visible; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1449,45 +1454,45 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base if (_tmp15_) { #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp12_ = TRUE; -#line 1453 "Tracker.c" +#line 1458 "Tracker.c" } else { - gboolean _tmp16_ = FALSE; + gboolean _tmp16_; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp16_ = fire_updated; #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp12_ = _tmp16_; -#line 1460 "Tracker.c" +#line 1465 "Tracker.c" } #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp12_; -#line 1464 "Tracker.c" +#line 1469 "Tracker.c" } #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp18_ = self->selected; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp18_ != NULL) { -#line 1470 "Tracker.c" - DataView* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; +#line 1475 "Tracker.c" + DataView* _tmp19_; + gboolean _tmp20_; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp19_ = view; #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp20_ = data_view_is_selected (_tmp19_); #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp17_ = _tmp20_; -#line 1479 "Tracker.c" +#line 1484 "Tracker.c" } else { #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp17_ = FALSE; -#line 1483 "Tracker.c" +#line 1488 "Tracker.c" } #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp17_) { -#line 1487 "Tracker.c" +#line 1492 "Tracker.c" gboolean _tmp21_ = FALSE; - CoreTrackerAccumulator* _tmp22_ = NULL; - DataView* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; + CoreTrackerAccumulator* _tmp22_; + DataView* _tmp23_; + gboolean _tmp24_; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp22_ = self->selected; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1498,18 +1503,18 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base if (_tmp24_) { #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp21_ = TRUE; -#line 1502 "Tracker.c" +#line 1507 "Tracker.c" } else { - gboolean _tmp25_ = FALSE; + gboolean _tmp25_; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp25_ = fire_updated; #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp21_ = _tmp25_; -#line 1509 "Tracker.c" +#line 1514 "Tracker.c" } #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp21_; -#line 1513 "Tracker.c" +#line 1518 "Tracker.c" } #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1517,7 +1522,7 @@ 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 1521 "Tracker.c" +#line 1526 "Tracker.c" } @@ -1525,14 +1530,14 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; + DataObject* _tmp0_; + DataView* _tmp1_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_ = NULL; + CoreTrackerAccumulator* _tmp2_; gboolean _tmp8_ = FALSE; - CoreTrackerAccumulator* _tmp9_ = NULL; + CoreTrackerAccumulator* _tmp9_; gboolean _tmp17_ = FALSE; - CoreTrackerAccumulator* _tmp18_ = NULL; + CoreTrackerAccumulator* _tmp18_; #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" @@ -1549,11 +1554,11 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba _tmp2_ = self->all; #line 133 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp2_ != NULL) { -#line 1553 "Tracker.c" +#line 1558 "Tracker.c" gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_ = NULL; - DataView* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + CoreTrackerAccumulator* _tmp4_; + DataView* _tmp5_; + gboolean _tmp6_; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp4_ = self->all; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1564,45 +1569,45 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba if (_tmp6_) { #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp3_ = TRUE; -#line 1568 "Tracker.c" +#line 1573 "Tracker.c" } else { - gboolean _tmp7_ = FALSE; + gboolean _tmp7_; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp7_ = fire_updated; #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp3_ = _tmp7_; -#line 1575 "Tracker.c" +#line 1580 "Tracker.c" } #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp3_; -#line 1579 "Tracker.c" +#line 1584 "Tracker.c" } #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp9_ = self->visible; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp9_ != NULL) { -#line 1585 "Tracker.c" - DataView* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; +#line 1590 "Tracker.c" + DataView* _tmp10_; + gboolean _tmp11_; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp10_ = view; #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp11_ = data_view_is_visible (_tmp10_); #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp8_ = _tmp11_; -#line 1594 "Tracker.c" +#line 1599 "Tracker.c" } else { #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp8_ = FALSE; -#line 1598 "Tracker.c" +#line 1603 "Tracker.c" } #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp8_) { -#line 1602 "Tracker.c" +#line 1607 "Tracker.c" gboolean _tmp12_ = FALSE; - CoreTrackerAccumulator* _tmp13_ = NULL; - DataView* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + CoreTrackerAccumulator* _tmp13_; + DataView* _tmp14_; + gboolean _tmp15_; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp13_ = self->visible; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1613,45 +1618,45 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba if (_tmp15_) { #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp12_ = TRUE; -#line 1617 "Tracker.c" +#line 1622 "Tracker.c" } else { - gboolean _tmp16_ = FALSE; + gboolean _tmp16_; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp16_ = fire_updated; #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp12_ = _tmp16_; -#line 1624 "Tracker.c" +#line 1629 "Tracker.c" } #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp12_; -#line 1628 "Tracker.c" +#line 1633 "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 1634 "Tracker.c" - DataView* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; +#line 1639 "Tracker.c" + DataView* _tmp19_; + gboolean _tmp20_; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp19_ = view; #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp20_ = data_view_is_selected (_tmp19_); #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp17_ = _tmp20_; -#line 1643 "Tracker.c" +#line 1648 "Tracker.c" } else { #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp17_ = FALSE; -#line 1647 "Tracker.c" +#line 1652 "Tracker.c" } #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp17_) { -#line 1651 "Tracker.c" +#line 1656 "Tracker.c" gboolean _tmp21_ = FALSE; - CoreTrackerAccumulator* _tmp22_ = NULL; - DataView* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; + CoreTrackerAccumulator* _tmp22_; + DataView* _tmp23_; + gboolean _tmp24_; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp22_ = self->selected; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1662,18 +1667,18 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba if (_tmp24_) { #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp21_ = TRUE; -#line 1666 "Tracker.c" +#line 1671 "Tracker.c" } else { - gboolean _tmp25_ = FALSE; + gboolean _tmp25_; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp25_ = fire_updated; #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp21_ = _tmp25_; -#line 1673 "Tracker.c" +#line 1678 "Tracker.c" } #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp21_; -#line 1677 "Tracker.c" +#line 1682 "Tracker.c" } #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1681,7 +1686,7 @@ 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 1685 "Tracker.c" +#line 1690 "Tracker.c" } @@ -1689,14 +1694,14 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base CoreViewTrackerMux * self; gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; + DataObject* _tmp0_; + DataView* _tmp1_; gboolean fire_updated = FALSE; - CoreTrackerAccumulator* _tmp2_ = NULL; + CoreTrackerAccumulator* _tmp2_; gboolean _tmp9_ = FALSE; - CoreTrackerAccumulator* _tmp10_ = NULL; + CoreTrackerAccumulator* _tmp10_; gboolean _tmp19_ = FALSE; - CoreTrackerAccumulator* _tmp20_ = NULL; + CoreTrackerAccumulator* _tmp20_; #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" @@ -1715,12 +1720,12 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base _tmp2_ = self->all; #line 150 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp2_ != NULL) { -#line 1719 "Tracker.c" +#line 1724 "Tracker.c" gboolean _tmp3_ = FALSE; - CoreTrackerAccumulator* _tmp4_ = NULL; - DataView* _tmp5_ = NULL; - Alteration* _tmp6_ = NULL; - gboolean _tmp7_ = 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" @@ -1733,46 +1738,46 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base if (_tmp7_) { #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp3_ = TRUE; -#line 1737 "Tracker.c" +#line 1742 "Tracker.c" } else { - gboolean _tmp8_ = FALSE; + gboolean _tmp8_; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp8_ = fire_updated; #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp3_ = _tmp8_; -#line 1744 "Tracker.c" +#line 1749 "Tracker.c" } #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp3_; -#line 1748 "Tracker.c" +#line 1753 "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 1754 "Tracker.c" - DataView* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 1759 "Tracker.c" + DataView* _tmp11_; + gboolean _tmp12_; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp11_ = view; #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp12_ = data_view_is_visible (_tmp11_); #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp9_ = _tmp12_; -#line 1763 "Tracker.c" +#line 1768 "Tracker.c" } else { #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp9_ = FALSE; -#line 1767 "Tracker.c" +#line 1772 "Tracker.c" } #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp9_) { -#line 1771 "Tracker.c" +#line 1776 "Tracker.c" gboolean _tmp13_ = FALSE; - CoreTrackerAccumulator* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; - Alteration* _tmp16_ = NULL; - gboolean _tmp17_ = 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" @@ -1785,46 +1790,46 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base if (_tmp17_) { #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp13_ = TRUE; -#line 1789 "Tracker.c" +#line 1794 "Tracker.c" } else { - gboolean _tmp18_ = FALSE; + gboolean _tmp18_; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp18_ = fire_updated; #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp13_ = _tmp18_; -#line 1796 "Tracker.c" +#line 1801 "Tracker.c" } #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp13_; -#line 1800 "Tracker.c" +#line 1805 "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 1806 "Tracker.c" - DataView* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; +#line 1811 "Tracker.c" + DataView* _tmp21_; + gboolean _tmp22_; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp21_ = view; #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp22_ = data_view_is_selected (_tmp21_); #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp19_ = _tmp22_; -#line 1815 "Tracker.c" +#line 1820 "Tracker.c" } else { #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp19_ = FALSE; -#line 1819 "Tracker.c" +#line 1824 "Tracker.c" } #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp19_) { -#line 1823 "Tracker.c" +#line 1828 "Tracker.c" gboolean _tmp23_ = FALSE; - CoreTrackerAccumulator* _tmp24_ = NULL; - DataView* _tmp25_ = NULL; - Alteration* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; + CoreTrackerAccumulator* _tmp24_; + DataView* _tmp25_; + Alteration* _tmp26_; + gboolean _tmp27_; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp24_ = self->selected; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1837,18 +1842,18 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base if (_tmp27_) { #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp23_ = TRUE; -#line 1841 "Tracker.c" +#line 1846 "Tracker.c" } else { - gboolean _tmp28_ = FALSE; + gboolean _tmp28_; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp28_ = fire_updated; #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp23_ = _tmp28_; -#line 1848 "Tracker.c" +#line 1853 "Tracker.c" } #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala" fire_updated = _tmp23_; -#line 1852 "Tracker.c" +#line 1857 "Tracker.c" } #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala" result = fire_updated; @@ -1856,7 +1861,7 @@ 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 1860 "Tracker.c" +#line 1865 "Tracker.c" } @@ -1865,7 +1870,7 @@ static void core_view_tracker_mux_class_init (CoreViewTrackerMuxClass * klass) { 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 1869 "Tracker.c" +#line 1874 "Tracker.c" } @@ -1873,12 +1878,12 @@ static void core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreT #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" - iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) core_view_tracker_mux_real_include; + iface->include = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) core_view_tracker_mux_real_include; #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala" - iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) core_view_tracker_mux_real_uninclude; + 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 1882 "Tracker.c" + iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) core_view_tracker_mux_real_altered; +#line 1887 "Tracker.c" } @@ -1886,7 +1891,7 @@ 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); @@ -1898,7 +1903,7 @@ 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 1902 "Tracker.c" +#line 1907 "Tracker.c" } @@ -1923,7 +1928,7 @@ static void core_view_tracker_class_init (CoreViewTrackerClass * klass) { ((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 1927 "Tracker.c" +#line 1932 "Tracker.c" } @@ -1932,32 +1937,32 @@ static void core_view_tracker_instance_init (CoreViewTracker * self) { self->priv = CORE_VIEW_TRACKER_GET_PRIVATE (self); #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala" self->priv->mux = NULL; -#line 1936 "Tracker.c" +#line 1941 "Tracker.c" } -static void core_view_tracker_finalize (CoreTracker* obj) { +static void core_view_tracker_finalize (CoreTracker * obj) { CoreViewTracker * self; - CoreViewTrackerMux* _tmp0_ = NULL; + CoreViewTrackerMux* _tmp0_; #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_TYPE_VIEW_TRACKER, CoreViewTracker); #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp0_ = self->priv->mux; #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala" if (_tmp0_ != NULL) { -#line 1949 "Tracker.c" +#line 1954 "Tracker.c" ViewCollection* collection = NULL; - DataCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; - ViewCollection* _tmp4_ = NULL; - guint _tmp5_ = 0U; - ViewCollection* _tmp6_ = NULL; - guint _tmp7_ = 0U; - ViewCollection* _tmp8_ = NULL; - guint _tmp9_ = 0U; - ViewCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + DataCollection* _tmp1_; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + guint _tmp5_; + ViewCollection* _tmp6_; + guint _tmp7_; + ViewCollection* _tmp8_; + guint _tmp9_; + ViewCollection* _tmp10_; + guint _tmp11_; #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala" _tmp1_ = core_tracker_get_collection (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker)); #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala" @@ -1966,7 +1971,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 1970 "Tracker.c" +#line 1975 "Tracker.c" } #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala" collection = _tmp2_; @@ -2000,13 +2005,13 @@ 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 2004 "Tracker.c" +#line 2009 "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 2010 "Tracker.c" +#line 2015 "Tracker.c" } diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c index 505093d..f1dc3ad 100644 --- a/src/core/ViewCollection.c +++ b/src/core/ViewCollection.c @@ -1,4 +1,4 @@ -/* ViewCollection.c generated by valac 0.34.7, the Vala compiler +/* ViewCollection.c generated by valac 0.36.6, the Vala compiler * generated from ViewCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -202,10 +202,32 @@ 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_ITEMS_SELECTED_SIGNAL, + VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL, + VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL, + VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL, + VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL, + VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL, + VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL, + VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL, + VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL, + VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL, + VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL, + VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL, + VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL, + VIEW_COLLECTION_LAST_SIGNAL +}; +static guint view_collection_signals[VIEW_COLLECTION_LAST_SIGNAL] = {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 +}; +static guint view_filter_signals[VIEW_FILTER_LAST_SIGNAL] = {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; } @@ -602,7 +624,7 @@ 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); +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); @@ -667,38 +689,38 @@ enum { }; ViewCollectionMonitor* view_collection_monitor_new (void); ViewCollectionMonitor* view_collection_monitor_construct (GType object_type); -static void view_collection_monitor_finalize (ViewCollectionMonitor* obj); +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_monitor_impl_finalize (ViewCollectionMonitor* obj); +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); +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); ViewManager* view_manager_construct (GType object_type); -static void view_manager_finalize (ViewManager* obj); +static void view_manager_finalize (ViewManager * obj); enum { VIEW_FILTER_DUMMY_PROPERTY }; 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); +static void view_filter_finalize (ViewFilter * obj); ViewCollection* view_collection_construct (GType object_type, const gchar* name) { ViewCollection* self = NULL; - const gchar* _tmp0_ = 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" @@ -707,37 +729,37 @@ ViewCollection* view_collection_construct (GType object_type, const gchar* name) self = (ViewCollection*) data_collection_construct (object_type, _tmp0_); #line 125 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 711 "ViewCollection.c" +#line 733 "ViewCollection.c" } 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 718 "ViewCollection.c" +#line 740 "ViewCollection.c" } 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 725 "ViewCollection.c" +#line 747 "ViewCollection.c" } static void view_collection_real_notify_items_selected_unselected (ViewCollection* self, GeeCollection* selected, GeeCollection* unselected) { gboolean _tmp0_ = FALSE; - GeeCollection* _tmp1_ = NULL; + GeeCollection* _tmp1_; gboolean has_selected = FALSE; gboolean _tmp5_ = FALSE; - GeeCollection* _tmp6_ = NULL; + GeeCollection* _tmp6_; gboolean has_unselected = FALSE; - gboolean _tmp10_ = FALSE; - gboolean _tmp12_ = FALSE; + gboolean _tmp10_; + gboolean _tmp12_; GeeCollection* sum = NULL; gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - GeeCollection* _tmp32_ = NULL; + gboolean _tmp15_; + GeeCollection* _tmp32_; #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" @@ -746,10 +768,10 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _tmp1_ = selected; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 750 "ViewCollection.c" - GeeCollection* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; +#line 772 "ViewCollection.c" + GeeCollection* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = selected; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -758,11 +780,11 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _tmp4_ = _tmp3_; #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_ > 0; -#line 762 "ViewCollection.c" +#line 784 "ViewCollection.c" } else { #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = FALSE; -#line 766 "ViewCollection.c" +#line 788 "ViewCollection.c" } #line 131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" has_selected = _tmp0_; @@ -770,10 +792,10 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _tmp6_ = unselected; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp6_ != NULL) { -#line 774 "ViewCollection.c" - GeeCollection* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 796 "ViewCollection.c" + GeeCollection* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = unselected; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -782,11 +804,11 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _tmp9_ = _tmp8_; #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _tmp9_ > 0; -#line 786 "ViewCollection.c" +#line 808 "ViewCollection.c" } else { #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = FALSE; -#line 790 "ViewCollection.c" +#line 812 "ViewCollection.c" } #line 132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" has_unselected = _tmp5_; @@ -794,47 +816,47 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _tmp10_ = has_selected; #line 134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp10_) { -#line 798 "ViewCollection.c" - GeeCollection* _tmp11_ = NULL; +#line 820 "ViewCollection.c" + GeeCollection* _tmp11_; #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_by_name (self, "items-selected", G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 804 "ViewCollection.c" + 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" } #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = has_unselected; #line 137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp12_) { -#line 810 "ViewCollection.c" - GeeCollection* _tmp13_ = NULL; +#line 832 "ViewCollection.c" + GeeCollection* _tmp13_; #line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp13_ = unselected; #line 138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit_by_name (self, "items-unselected", G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 816 "ViewCollection.c" + 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" } #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp15_ = has_selected; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp15_) { -#line 822 "ViewCollection.c" - gboolean _tmp16_ = FALSE; +#line 844 "ViewCollection.c" + gboolean _tmp16_; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp16_ = has_unselected; #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = !_tmp16_; -#line 828 "ViewCollection.c" +#line 850 "ViewCollection.c" } else { #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = FALSE; -#line 832 "ViewCollection.c" +#line 854 "ViewCollection.c" } #line 141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp14_) { -#line 836 "ViewCollection.c" - GeeCollection* _tmp17_ = NULL; - GeeCollection* _tmp18_ = NULL; +#line 858 "ViewCollection.c" + GeeCollection* _tmp17_; + GeeCollection* _tmp18_; #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = selected; #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -843,31 +865,31 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _g_object_unref0 (sum); #line 142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sum = _tmp18_; -#line 847 "ViewCollection.c" +#line 869 "ViewCollection.c" } else { gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; + gboolean _tmp20_; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp20_ = has_selected; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!_tmp20_) { -#line 855 "ViewCollection.c" - gboolean _tmp21_ = FALSE; +#line 877 "ViewCollection.c" + gboolean _tmp21_; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp21_ = has_unselected; #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp19_ = _tmp21_; -#line 861 "ViewCollection.c" +#line 883 "ViewCollection.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp19_ = FALSE; -#line 865 "ViewCollection.c" +#line 887 "ViewCollection.c" } #line 143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp19_) { -#line 869 "ViewCollection.c" - GeeCollection* _tmp22_ = NULL; - GeeCollection* _tmp23_ = NULL; +#line 891 "ViewCollection.c" + GeeCollection* _tmp22_; + GeeCollection* _tmp23_; #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp22_ = unselected; #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -876,25 +898,25 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _g_object_unref0 (sum); #line 144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sum = _tmp23_; -#line 880 "ViewCollection.c" +#line 902 "ViewCollection.c" } else { gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; + gboolean _tmp25_; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp25_ = has_selected; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!_tmp25_) { -#line 888 "ViewCollection.c" - gboolean _tmp26_ = FALSE; +#line 910 "ViewCollection.c" + gboolean _tmp26_; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp26_ = has_unselected; #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp24_ = !_tmp26_; -#line 894 "ViewCollection.c" +#line 916 "ViewCollection.c" } else { #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp24_ = FALSE; -#line 898 "ViewCollection.c" +#line 920 "ViewCollection.c" } #line 145 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp24_) { @@ -902,13 +924,13 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _g_object_unref0 (sum); #line 146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sum = NULL; -#line 906 "ViewCollection.c" +#line 928 "ViewCollection.c" } else { - GeeHashSet* _tmp27_ = NULL; - GeeCollection* _tmp28_ = NULL; - GeeCollection* _tmp29_ = NULL; - GeeCollection* _tmp30_ = NULL; - GeeCollection* _tmp31_ = NULL; + GeeHashSet* _tmp27_; + GeeCollection* _tmp28_; + GeeCollection* _tmp29_; + GeeCollection* _tmp30_; + GeeCollection* _tmp31_; #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); #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -927,7 +949,7 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _tmp31_ = unselected; #line 150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" gee_collection_add_all (_tmp30_, _tmp31_); -#line 931 "ViewCollection.c" +#line 953 "ViewCollection.c" } } } @@ -935,19 +957,19 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio _tmp32_ = sum; #line 153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp32_ != NULL) { -#line 939 "ViewCollection.c" - GeeCollection* _tmp33_ = NULL; +#line 961 "ViewCollection.c" + GeeCollection* _tmp33_; #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp33_ = sum; #line 154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit_by_name (self, "items-state-changed", 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 (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable)); #line 155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_selection_group_altered (self); -#line 947 "ViewCollection.c" +#line 969 "ViewCollection.c" } #line 129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); -#line 951 "ViewCollection.c" +#line 973 "ViewCollection.c" } @@ -956,14 +978,14 @@ void view_collection_notify_items_selected_unselected (ViewCollection* self, Gee 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 960 "ViewCollection.c" +#line 982 "ViewCollection.c" } static void view_collection_real_notify_selection_group_altered (ViewCollection* self) { #line 160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_emit_by_name (self, "selection-group-altered"); -#line 967 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL], 0); +#line 989 "ViewCollection.c" } @@ -972,19 +994,19 @@ void view_collection_notify_selection_group_altered (ViewCollection* self) { 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 976 "ViewCollection.c" +#line 998 "ViewCollection.c" } static void view_collection_real_notify_item_view_altered (ViewCollection* self, DataView* view) { - DataView* _tmp0_ = NULL; + DataView* _tmp0_; #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_by_name (self, "item-view-altered", _tmp0_); -#line 988 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL], 0, _tmp0_); +#line 1010 "ViewCollection.c" } @@ -993,19 +1015,19 @@ void view_collection_notify_item_view_altered (ViewCollection* self, DataView* v 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 997 "ViewCollection.c" +#line 1019 "ViewCollection.c" } static void view_collection_real_notify_views_altered (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "views-altered", _tmp0_); -#line 1009 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL], 0, _tmp0_); +#line 1031 "ViewCollection.c" } @@ -1014,19 +1036,19 @@ void view_collection_notify_views_altered (ViewCollection* self, GeeCollection* 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 1018 "ViewCollection.c" +#line 1040 "ViewCollection.c" } static void view_collection_real_notify_item_geometry_altered (ViewCollection* self, DataView* view) { - DataView* _tmp0_ = NULL; + DataView* _tmp0_; #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_by_name (self, "item-geometry-altered", _tmp0_); -#line 1030 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL], 0, _tmp0_); +#line 1052 "ViewCollection.c" } @@ -1035,19 +1057,19 @@ void view_collection_notify_item_geometry_altered (ViewCollection* self, DataVie 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 1039 "ViewCollection.c" +#line 1061 "ViewCollection.c" } static void view_collection_real_notify_geometries_altered (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "geometries-altered", _tmp0_); -#line 1051 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL], 0, _tmp0_); +#line 1073 "ViewCollection.c" } @@ -1056,19 +1078,19 @@ void view_collection_notify_geometries_altered (ViewCollection* self, GeeCollect 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 1060 "ViewCollection.c" +#line 1082 "ViewCollection.c" } static void view_collection_real_notify_items_shown (ViewCollection* self, GeeCollection* shown) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "items-shown", _tmp0_); -#line 1072 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL], 0, _tmp0_); +#line 1094 "ViewCollection.c" } @@ -1077,19 +1099,19 @@ void view_collection_notify_items_shown (ViewCollection* self, GeeCollection* sh 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 1081 "ViewCollection.c" +#line 1103 "ViewCollection.c" } static void view_collection_real_notify_items_hidden (ViewCollection* self, GeeCollection* hidden) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "items-hidden", _tmp0_); -#line 1093 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL], 0, _tmp0_); +#line 1115 "ViewCollection.c" } @@ -1098,19 +1120,19 @@ void view_collection_notify_items_hidden (ViewCollection* self, GeeCollection* h 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 1102 "ViewCollection.c" +#line 1124 "ViewCollection.c" } static void view_collection_real_notify_items_visibility_changed (ViewCollection* self, GeeCollection* changed) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #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_by_name (self, "items-visibility-changed", _tmp0_); -#line 1114 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL], 0, _tmp0_); +#line 1136 "ViewCollection.c" } @@ -1119,19 +1141,19 @@ void view_collection_notify_items_visibility_changed (ViewCollection* self, GeeC 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 1123 "ViewCollection.c" +#line 1145 "ViewCollection.c" } static void view_collection_real_notify_view_filter_installed (ViewCollection* self, ViewFilter* filter) { - ViewFilter* _tmp0_ = NULL; + ViewFilter* _tmp0_; #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_by_name (self, "view-filter-installed", _tmp0_); -#line 1135 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_INSTALLED_SIGNAL], 0, _tmp0_); +#line 1157 "ViewCollection.c" } @@ -1140,19 +1162,19 @@ void view_collection_notify_view_filter_installed (ViewCollection* self, ViewFil 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 1144 "ViewCollection.c" +#line 1166 "ViewCollection.c" } static void view_collection_real_notify_view_filter_removed (ViewCollection* self, ViewFilter* filter) { - ViewFilter* _tmp0_ = NULL; + ViewFilter* _tmp0_; #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_by_name (self, "view-filter-removed", _tmp0_); -#line 1156 "ViewCollection.c" + g_signal_emit (self, view_collection_signals[VIEW_COLLECTION_VIEW_FILTER_REMOVED_SIGNAL], 0, _tmp0_); +#line 1178 "ViewCollection.c" } @@ -1161,16 +1183,16 @@ void view_collection_notify_view_filter_removed (ViewCollection* self, ViewFilte 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 1165 "ViewCollection.c" +#line 1187 "ViewCollection.c" } static void view_collection_real_clear (DataCollection* base) { ViewCollection * self; gboolean _tmp0_ = FALSE; - GeeHashMultiMap* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + GeeHashMultiMap* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1183,20 +1205,20 @@ static void view_collection_real_clear (DataCollection* base) { if (_tmp3_ > 0) { #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = TRUE; -#line 1187 "ViewCollection.c" +#line 1209 "ViewCollection.c" } else { - ViewCollection* _tmp4_ = NULL; + 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 1194 "ViewCollection.c" +#line 1216 "ViewCollection.c" } #line 202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_) { -#line 1198 "ViewCollection.c" - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 1220 "ViewCollection.c" + gchar* _tmp5_; + gchar* _tmp6_; #line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 203 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1208,35 +1230,35 @@ static void view_collection_real_clear (DataCollection* base) { _g_free0 (_tmp6_); #line 205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1211 "ViewCollection.c" +#line 1233 "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 1215 "ViewCollection.c" +#line 1237 "ViewCollection.c" } 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 1222 "ViewCollection.c" +#line 1244 "ViewCollection.c" } static void view_collection_real_close (DataCollection* base) { ViewCollection * self; - GeeSet* _tmp8_ = NULL; + GeeSet* _tmp8_; #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 1235 "ViewCollection.c" +#line 1257 "ViewCollection.c" { GeeIterator* _f_it = NULL; - GeeSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeSet* _tmp0_; + GeeIterator* _tmp1_; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->filters; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1245,14 +1267,14 @@ static void view_collection_real_close (DataCollection* base) { _f_it = _tmp1_; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1248 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1270 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; ViewFilter* f = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - ViewFilter* _tmp6_ = NULL; - guint _tmp7_ = 0U; + GeeIterator* _tmp4_; + gpointer _tmp5_; + ViewFilter* _tmp6_; + guint _tmp7_; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _f_it; #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1261,7 +1283,7 @@ static void view_collection_real_close (DataCollection* base) { if (!_tmp3_) { #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1264 "ViewCollection.c" +#line 1286 "ViewCollection.c" } #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _f_it; @@ -1277,11 +1299,11 @@ static void view_collection_real_close (DataCollection* base) { 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); #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_filter_unref0 (f); -#line 1280 "ViewCollection.c" +#line 1302 "ViewCollection.c" } #line 214 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_f_it); -#line 1284 "ViewCollection.c" +#line 1306 "ViewCollection.c" } #line 216 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = self->priv->filters; @@ -1289,22 +1311,22 @@ static void view_collection_real_close (DataCollection* base) { gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, 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 1292 "ViewCollection.c" +#line 1314 "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* result = NULL; ViewCollectionMonitorImpl* monitor = NULL; - SourceCollection* _tmp0_ = NULL; - ViewManager* _tmp1_ = NULL; - Alteration* _tmp2_ = NULL; - ViewCollectionMonitorImpl* _tmp3_ = NULL; - GeeHashMultiMap* _tmp4_ = NULL; - SourceCollection* _tmp5_ = NULL; - ViewCollectionMonitorImpl* _tmp6_ = NULL; + SourceCollection* _tmp0_; + ViewManager* _tmp1_; + Alteration* _tmp2_; + ViewCollectionMonitorImpl* _tmp3_; + GeeHashMultiMap* _tmp4_; + SourceCollection* _tmp5_; + ViewCollectionMonitorImpl* _tmp6_; gboolean _tmp7_ = FALSE; - GeeCollection* _tmp8_ = NULL; + GeeCollection* _tmp8_; #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" @@ -1341,10 +1363,10 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection _tmp8_ = initial; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp8_ != NULL) { -#line 1344 "ViewCollection.c" - GeeCollection* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 1366 "ViewCollection.c" + GeeCollection* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp9_ = initial; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1353,31 +1375,31 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection _tmp11_ = _tmp10_; #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = _tmp11_ > 0; -#line 1356 "ViewCollection.c" +#line 1378 "ViewCollection.c" } else { #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = FALSE; -#line 1360 "ViewCollection.c" +#line 1382 "ViewCollection.c" } #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp7_) { -#line 1364 "ViewCollection.c" +#line 1386 "ViewCollection.c" GeeArrayList* created_views = NULL; - GeeArrayList* _tmp12_ = NULL; - GeeArrayList* _tmp24_ = NULL; - ProgressMonitor _tmp25_ = NULL; - void* _tmp25__target = NULL; - GeeCollection* _tmp26_ = NULL; - GeeCollection* _tmp27_ = NULL; + GeeArrayList* _tmp12_; + GeeArrayList* _tmp24_; + ProgressMonitor _tmp25_; + void* _tmp25__target; + GeeCollection* _tmp26_; + GeeCollection* _tmp27_; #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); #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" created_views = _tmp12_; -#line 1376 "ViewCollection.c" +#line 1398 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp13_ = initial; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1386,17 +1408,17 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection _source_it = _tmp14_; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1389 "ViewCollection.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 1411 "ViewCollection.c" + GeeIterator* _tmp15_; + gboolean _tmp16_; DataSource* source = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; - GeeArrayList* _tmp19_ = NULL; - ViewManager* _tmp20_ = NULL; - DataSource* _tmp21_ = NULL; - DataView* _tmp22_ = NULL; - DataView* _tmp23_ = 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; #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1405,7 +1427,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection if (!_tmp16_) { #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1408 "ViewCollection.c" +#line 1430 "ViewCollection.c" } #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = _source_it; @@ -1429,11 +1451,11 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection _g_object_unref0 (_tmp23_); #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 1432 "ViewCollection.c" +#line 1454 "ViewCollection.c" } #line 236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 1436 "ViewCollection.c" +#line 1458 "ViewCollection.c" } #line 239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp24_ = created_views; @@ -1449,14 +1471,14 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection _g_object_unref0 (_tmp27_); #line 233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); -#line 1452 "ViewCollection.c" +#line 1474 "ViewCollection.c" } else { - SourceCollection* _tmp28_ = NULL; - SourceCollection* _tmp29_ = NULL; - GeeCollection* _tmp30_ = NULL; - GeeIterable* _tmp31_ = NULL; - ProgressMonitor _tmp32_ = NULL; - void* _tmp32__target = NULL; + 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" @@ -1473,7 +1495,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection view_collection_add_sources (self, _tmp28_, _tmp31_, _tmp32_, _tmp32__target); #line 242 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp31_); -#line 1476 "ViewCollection.c" +#line 1498 "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)); @@ -1481,25 +1503,25 @@ 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 1484 "ViewCollection.c" +#line 1506 "ViewCollection.c" } 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 1491 "ViewCollection.c" +#line 1513 "ViewCollection.c" } void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonitor* m) { ViewCollectionMonitorImpl* monitor = NULL; - ViewCollectionMonitor* _tmp0_ = NULL; - ViewCollectionMonitorImpl* _tmp1_ = NULL; + ViewCollectionMonitor* _tmp0_; + ViewCollectionMonitorImpl* _tmp1_; gboolean removed = FALSE; - GeeHashMultiMap* _tmp2_ = NULL; - SourceCollection* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeHashMultiMap* _tmp2_; + SourceCollection* _tmp3_; + gboolean _tmp4_; #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" @@ -1522,61 +1544,61 @@ void view_collection_halt_monitoring (ViewCollection* self, ViewCollectionMonito _vala_assert (removed, "removed"); #line 250 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); -#line 1525 "ViewCollection.c" +#line 1547 "ViewCollection.c" } void view_collection_halt_all_monitoring (ViewCollection* self) { - GeeHashMultiMap* _tmp0_ = NULL; + GeeHashMultiMap* _tmp0_; #line 257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _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 1537 "ViewCollection.c" +#line 1559 "ViewCollection.c" } 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 1544 "ViewCollection.c" +#line 1566 "ViewCollection.c" } 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 1551 "ViewCollection.c" +#line 1573 "ViewCollection.c" } 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 1558 "ViewCollection.c" +#line 1580 "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) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - CreateView _tmp2_ = NULL; - void* _tmp2__target = NULL; - CreateViewPredicate _tmp3_ = NULL; - void* _tmp3__target = NULL; - ViewCollection* _tmp4_ = NULL; - void* _tmp5_ = NULL; - Comparator _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - void* _tmp8_ = NULL; - ComparatorPredicate _tmp9_ = NULL; - ViewCollection* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - ViewCollection* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; + 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_; #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" @@ -1639,23 +1661,23 @@ void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, Cr _tmp14_ = 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 1642 "ViewCollection.c" +#line 1664 "ViewCollection.c" } void view_collection_halt_mirroring (ViewCollection* self) { - ViewCollection* _tmp0_ = NULL; + ViewCollection* _tmp0_; #line 279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->mirroring; #line 280 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp0_ != NULL) { -#line 1654 "ViewCollection.c" - ViewCollection* _tmp1_ = NULL; - guint _tmp2_ = 0U; - ViewCollection* _tmp3_ = NULL; - guint _tmp4_ = 0U; +#line 1676 "ViewCollection.c" + ViewCollection* _tmp1_; + guint _tmp2_; + ViewCollection* _tmp3_; + guint _tmp4_; #line 281 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->mirroring; #line 281 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1668,22 +1690,22 @@ 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 1671 "ViewCollection.c" +#line 1693 "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 1677 "ViewCollection.c" +#line 1699 "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) { GeeArrayList* copy_view = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp25_ = NULL; - GeeCollection* _tmp26_ = NULL; - GeeCollection* _tmp27_ = NULL; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp25_; + GeeCollection* _tmp26_; + GeeCollection* _tmp27_; #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" @@ -1692,14 +1714,14 @@ 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 1695 "ViewCollection.c" +#line 1717 "ViewCollection.c" { GeeIterator* _object_it = NULL; - ViewCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + ViewCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _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" @@ -1716,22 +1738,22 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C _object_it = _tmp5_; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 1719 "ViewCollection.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 1741 "ViewCollection.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; DataView* view = NULL; - DataObject* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - CreateViewPredicate _tmp12_ = NULL; - void* _tmp12__target = NULL; - DataView* _tmp13_ = NULL; - DataSource* _tmp14_ = NULL; - DataSource* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; + 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; #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1740,7 +1762,7 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C if (!_tmp7_) { #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1743 "ViewCollection.c" +#line 1765 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = _object_it; @@ -1772,15 +1794,15 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C _g_object_unref0 (_tmp15_); #line 294 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp17_) { -#line 1775 "ViewCollection.c" - GeeArrayList* _tmp18_ = NULL; - CreateView _tmp19_ = NULL; - void* _tmp19__target = NULL; - DataView* _tmp20_ = NULL; - DataSource* _tmp21_ = NULL; - DataSource* _tmp22_ = NULL; - DataView* _tmp23_ = NULL; - DataView* _tmp24_ = NULL; +#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" @@ -1803,17 +1825,17 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C _g_object_unref0 (_tmp24_); #line 295 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp22_); -#line 1806 "ViewCollection.c" +#line 1828 "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 1812 "ViewCollection.c" +#line 1834 "ViewCollection.c" } #line 292 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 1816 "ViewCollection.c" +#line 1838 "ViewCollection.c" } #line 298 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp25_ = copy_view; @@ -1825,15 +1847,15 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C _g_object_unref0 (_tmp27_); #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (copy_view); -#line 1828 "ViewCollection.c" +#line 1850 "ViewCollection.c" } gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFilter* f) { gboolean result = FALSE; - GeeSet* _tmp0_ = NULL; - ViewFilter* _tmp1_ = NULL; - gboolean _tmp2_ = 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" @@ -1848,17 +1870,17 @@ gboolean view_collection_is_view_filter_installed (ViewCollection* self, ViewFil result = _tmp2_; #line 302 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 1851 "ViewCollection.c" +#line 1873 "ViewCollection.c" } void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) { - ViewFilter* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GeeSet* _tmp2_ = NULL; - ViewFilter* _tmp3_ = NULL; - ViewFilter* _tmp4_ = NULL; - ViewFilter* _tmp5_ = NULL; + ViewFilter* _tmp0_; + gboolean _tmp1_; + GeeSet* _tmp2_; + ViewFilter* _tmp3_; + ViewFilter* _tmp4_; + ViewFilter* _tmp5_; #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" @@ -1871,7 +1893,7 @@ void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) { if (_tmp1_) { #line 307 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1874 "ViewCollection.c" +#line 1896 "ViewCollection.c" } #line 309 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->filters; @@ -1889,18 +1911,18 @@ void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f) { _tmp5_ = f; #line 316 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_view_filter_installed (self, _tmp5_); -#line 1892 "ViewCollection.c" +#line 1914 "ViewCollection.c" } void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) { - ViewFilter* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GeeSet* _tmp2_ = NULL; - ViewFilter* _tmp3_ = NULL; - ViewFilter* _tmp4_ = NULL; - guint _tmp5_ = 0U; - ViewFilter* _tmp6_ = NULL; + ViewFilter* _tmp0_; + gboolean _tmp1_; + GeeSet* _tmp2_; + ViewFilter* _tmp3_; + ViewFilter* _tmp4_; + guint _tmp5_; + ViewFilter* _tmp6_; #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" @@ -1913,7 +1935,7 @@ void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) { if (!_tmp1_) { #line 321 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 1916 "ViewCollection.c" +#line 1938 "ViewCollection.c" } #line 323 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->filters; @@ -1933,13 +1955,13 @@ void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f) { _tmp6_ = f; #line 330 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_view_filter_removed (self, _tmp6_); -#line 1936 "ViewCollection.c" +#line 1958 "ViewCollection.c" } static void view_collection_on_view_filter_refresh (ViewCollection* self) { - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; #line 333 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 334 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1950,7 +1972,7 @@ 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 1953 "ViewCollection.c" +#line 1975 "ViewCollection.c" } @@ -1960,11 +1982,11 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi 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 1963 "ViewCollection.c" +#line 1985 "ViewCollection.c" { GeeIterator* _f_it = NULL; - GeeSet* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeSet* _tmp0_; + GeeIterator* _tmp1_; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->filters; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1973,15 +1995,15 @@ 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 1976 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1998 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; ViewFilter* f = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - ViewFilter* _tmp6_ = NULL; - DataView* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + GeeIterator* _tmp4_; + gpointer _tmp5_; + ViewFilter* _tmp6_; + DataView* _tmp7_; + gboolean _tmp8_; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _f_it; #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1990,7 +2012,7 @@ static gboolean view_collection_is_in_filter (ViewCollection* self, DataView* vi if (!_tmp3_) { #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 1993 "ViewCollection.c" +#line 2015 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _f_it; @@ -2014,28 +2036,28 @@ 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 2017 "ViewCollection.c" +#line 2039 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_filter_unref0 (f); -#line 2021 "ViewCollection.c" +#line 2043 "ViewCollection.c" } #line 339 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_f_it); -#line 2025 "ViewCollection.c" +#line 2047 "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 2031 "ViewCollection.c" +#line 2053 "ViewCollection.c" } static gboolean view_collection_real_valid_type (DataCollection* base, DataObject* object) { ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_ = NULL; + 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" @@ -2046,13 +2068,13 @@ static gboolean view_collection_real_valid_type (DataCollection* base, DataObjec result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_VIEW); #line 347 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2049 "ViewCollection.c" +#line 2071 "ViewCollection.c" } static void view_collection_on_sources_added (ViewCollection* self, DataCollection* sources, GeeIterable* added) { - DataCollection* _tmp0_ = NULL; - GeeIterable* _tmp1_ = NULL; + DataCollection* _tmp0_; + GeeIterable* _tmp1_; #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" @@ -2065,7 +2087,7 @@ static void view_collection_on_sources_added (ViewCollection* self, DataCollecti _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 2068 "ViewCollection.c" +#line 2090 "ViewCollection.c" } @@ -2074,14 +2096,14 @@ static DataView* _view_manager_create_view_create_view (DataSource* source, gpoi result = view_manager_create_view ((ViewManager*) self, source); #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2077 "ViewCollection.c" +#line 2099 "ViewCollection.c" } 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_ = NULL; + DataView* _tmp37_; #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" @@ -2092,11 +2114,11 @@ 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 2095 "ViewCollection.c" +#line 2117 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = added; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2105,17 +2127,17 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _source_it = _tmp1_; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2108 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 2130 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; CreateView factory = NULL; - void* factory_target = NULL; - GDestroyNotify factory_target_destroy_notify = NULL; - CreateView _tmp22_ = NULL; - void* _tmp22__target = 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; #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2124,7 +2146,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* if (!_tmp3_) { #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2127 "ViewCollection.c" +#line 2149 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _source_it; @@ -2138,15 +2160,15 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* factory_target = NULL; #line 361 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" factory_target_destroy_notify = NULL; -#line 2141 "ViewCollection.c" +#line 2163 "ViewCollection.c" { GeeIterator* _monitor_it = NULL; - GeeHashMultiMap* _tmp6_ = NULL; - SourceCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; - GeeIterator* _tmp11_ = 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; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2165,16 +2187,16 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _monitor_it = _tmp11_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2168 "ViewCollection.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 2190 "ViewCollection.c" + GeeIterator* _tmp12_; + gboolean _tmp13_; ViewCollectionMonitorImpl* monitor = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; - ViewCollectionMonitorImpl* _tmp16_ = NULL; - ViewManager* _tmp17_ = NULL; - DataSource* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + GeeIterator* _tmp14_; + gpointer _tmp15_; + ViewCollectionMonitorImpl* _tmp16_; + ViewManager* _tmp17_; + DataSource* _tmp18_; + gboolean _tmp19_; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = _monitor_it; #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2183,7 +2205,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* if (!_tmp13_) { #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2186 "ViewCollection.c" +#line 2208 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = _monitor_it; @@ -2201,9 +2223,9 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _tmp19_ = view_manager_include_in_view (_tmp17_, _tmp18_); #line 363 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp19_) { -#line 2204 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp20_ = NULL; - ViewManager* _tmp21_ = NULL; +#line 2226 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp20_; + ViewManager* _tmp21_; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp20_ = monitor; #line 364 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2226,15 +2248,15 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _view_collection_monitor_unref0 (monitor); #line 366 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2229 "ViewCollection.c" +#line 2251 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor); -#line 2233 "ViewCollection.c" +#line 2255 "ViewCollection.c" } #line 362 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_monitor_it); -#line 2237 "ViewCollection.c" +#line 2259 "ViewCollection.c" } #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp22_ = factory; @@ -2242,13 +2264,13 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _tmp22__target = factory_target; #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp22_ != NULL) { -#line 2245 "ViewCollection.c" +#line 2267 "ViewCollection.c" DataView* new_view = NULL; - CreateView _tmp23_ = NULL; - void* _tmp23__target = NULL; - DataSource* _tmp24_ = NULL; - DataView* _tmp25_ = NULL; - GeeArrayList* _tmp26_ = NULL; + CreateView _tmp23_; + void* _tmp23__target; + DataSource* _tmp24_; + DataView* _tmp25_; + GeeArrayList* _tmp26_; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp23_ = factory; #line 371 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2263,25 +2285,25 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _tmp26_ = created_views; #line 375 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp26_ != NULL) { -#line 2266 "ViewCollection.c" - GeeArrayList* _tmp27_ = NULL; - DataView* _tmp28_ = NULL; +#line 2288 "ViewCollection.c" + GeeArrayList* _tmp27_; + DataView* _tmp28_; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp27_ = created_views; #line 376 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp28_ = 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 2275 "ViewCollection.c" +#line 2297 "ViewCollection.c" } else { - DataView* _tmp29_ = NULL; + DataView* _tmp29_; #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp29_ = created_view; #line 377 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp29_ == NULL) { -#line 2282 "ViewCollection.c" - DataView* _tmp30_ = NULL; - DataView* _tmp31_ = NULL; +#line 2304 "ViewCollection.c" + DataView* _tmp30_; + DataView* _tmp31_; #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp30_ = new_view; #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2290,13 +2312,13 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _g_object_unref0 (created_view); #line 378 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" created_view = _tmp31_; -#line 2293 "ViewCollection.c" +#line 2315 "ViewCollection.c" } else { - GeeArrayList* _tmp32_ = NULL; - GeeArrayList* _tmp33_ = NULL; - DataView* _tmp34_ = NULL; - GeeArrayList* _tmp35_ = NULL; - DataView* _tmp36_ = NULL; + GeeArrayList* _tmp32_; + GeeArrayList* _tmp33_; + DataView* _tmp34_; + GeeArrayList* _tmp35_; + DataView* _tmp36_; #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); #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2319,12 +2341,12 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _tmp36_ = 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 2322 "ViewCollection.c" +#line 2344 "ViewCollection.c" } } #line 370 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (new_view); -#line 2327 "ViewCollection.c" +#line 2349 "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); @@ -2336,34 +2358,34 @@ 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 2339 "ViewCollection.c" +#line 2361 "ViewCollection.c" } #line 360 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 2343 "ViewCollection.c" +#line 2365 "ViewCollection.c" } #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp37_ = created_view; #line 388 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp37_ != NULL) { -#line 2349 "ViewCollection.c" - DataView* _tmp38_ = NULL; +#line 2371 "ViewCollection.c" + DataView* _tmp38_; #line 389 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp38_ = 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 2355 "ViewCollection.c" +#line 2377 "ViewCollection.c" } else { gboolean _tmp39_ = FALSE; - GeeArrayList* _tmp40_ = NULL; + GeeArrayList* _tmp40_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp40_ = created_views; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp40_ != NULL) { -#line 2363 "ViewCollection.c" - GeeArrayList* _tmp41_ = NULL; - gint _tmp42_ = 0; - gint _tmp43_ = 0; +#line 2385 "ViewCollection.c" + GeeArrayList* _tmp41_; + gint _tmp42_; + gint _tmp43_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp41_ = created_views; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2372,20 +2394,20 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _tmp43_ = _tmp42_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp39_ = _tmp43_ > 0; -#line 2375 "ViewCollection.c" +#line 2397 "ViewCollection.c" } else { #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp39_ = FALSE; -#line 2379 "ViewCollection.c" +#line 2401 "ViewCollection.c" } #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp39_) { -#line 2383 "ViewCollection.c" - GeeArrayList* _tmp44_ = NULL; - ProgressMonitor _tmp45_ = NULL; - void* _tmp45__target = NULL; - GeeCollection* _tmp46_ = NULL; - GeeCollection* _tmp47_ = NULL; +#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" @@ -2398,26 +2420,26 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* _tmp47_ = _tmp46_; #line 391 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp47_); -#line 2401 "ViewCollection.c" +#line 2423 "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 2408 "ViewCollection.c" +#line 2430 "ViewCollection.c" } static gboolean view_collection_real_add (DataCollection* base, DataObject* object) { ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_ = NULL; - DataObject* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - DataObject* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; + DataObject* _tmp0_; + DataObject* _tmp1_; + gboolean _tmp2_; + DataObject* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; #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" @@ -2436,7 +2458,7 @@ static gboolean view_collection_real_add (DataCollection* base, DataObject* obje result = FALSE; #line 398 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2439 "ViewCollection.c" +#line 2461 "ViewCollection.c" } #line 400 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = object; @@ -2452,7 +2474,7 @@ static gboolean view_collection_real_add (DataCollection* base, DataObject* obje result = TRUE; #line 402 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2455 "ViewCollection.c" +#line 2477 "ViewCollection.c" } @@ -2460,19 +2482,19 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo ViewCollection * self; GeeCollection* result = NULL; GeeCollection* return_list = NULL; - GeeCollection* _tmp7_ = NULL; - ProgressMonitor _tmp8_ = NULL; - void* _tmp8__target = NULL; - GeeCollection* _tmp9_ = NULL; + GeeCollection* _tmp7_; + ProgressMonitor _tmp8_; + void* _tmp8__target; + GeeCollection* _tmp9_; #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 2471 "ViewCollection.c" +#line 2493 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = objects; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2481,13 +2503,13 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo _object_it = _tmp1_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2484 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 2506 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - DataObject* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataObject* _tmp6_; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _object_it; #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2496,7 +2518,7 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo if (!_tmp3_) { #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2499 "ViewCollection.c" +#line 2521 "ViewCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _object_it; @@ -2510,11 +2532,11 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo data_view_internal_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView), TRUE); #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 2513 "ViewCollection.c" +#line 2535 "ViewCollection.c" } #line 407 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 2517 "ViewCollection.c" +#line 2539 "ViewCollection.c" } #line 410 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = objects; @@ -2532,25 +2554,25 @@ static GeeCollection* view_collection_real_add_many (DataCollection* base, GeeCo result = return_list; #line 414 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 2535 "ViewCollection.c" +#line 2557 "ViewCollection.c" } static void view_collection_on_sources_removed (ViewCollection* self, GeeIterable* removed) { Marker* marker = NULL; gboolean _tmp14_ = FALSE; - Marker* _tmp15_ = NULL; + Marker* _tmp15_; #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 2549 "ViewCollection.c" +#line 2571 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = removed; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2559,17 +2581,17 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl _source_it = _tmp1_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2562 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 2584 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; DataView* view = NULL; - GeeHashMap* _tmp6_ = NULL; - DataSource* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - DataView* _tmp9_ = NULL; + GeeHashMap* _tmp6_; + DataSource* _tmp7_; + gpointer _tmp8_; + DataView* _tmp9_; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _source_it; #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2578,7 +2600,7 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl if (!_tmp3_) { #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2581 "ViewCollection.c" +#line 2603 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _source_it; @@ -2598,23 +2620,23 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl _tmp9_ = view; #line 424 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp9_ != NULL) { -#line 2601 "ViewCollection.c" - Marker* _tmp10_ = NULL; - Marker* _tmp12_ = NULL; - DataView* _tmp13_ = NULL; +#line 2623 "ViewCollection.c" + Marker* _tmp10_; + Marker* _tmp12_; + DataView* _tmp13_; #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp10_ = marker; #line 425 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp10_ == NULL) { -#line 2609 "ViewCollection.c" - Marker* _tmp11_ = NULL; +#line 2631 "ViewCollection.c" + Marker* _tmp11_; #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)); #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 2617 "ViewCollection.c" +#line 2639 "ViewCollection.c" } #line 428 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = marker; @@ -2622,50 +2644,50 @@ static void view_collection_on_sources_removed (ViewCollection* self, GeeIterabl _tmp13_ = 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 2625 "ViewCollection.c" +#line 2647 "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 2631 "ViewCollection.c" +#line 2653 "ViewCollection.c" } #line 420 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 2635 "ViewCollection.c" +#line 2657 "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 2641 "ViewCollection.c" - Marker* _tmp16_ = NULL; - gint _tmp17_ = 0; +#line 2663 "ViewCollection.c" + Marker* _tmp16_; + gint _tmp17_; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp16_ = marker; #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = marker_get_count (_tmp16_); #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = _tmp17_ != 0; -#line 2650 "ViewCollection.c" +#line 2672 "ViewCollection.c" } else { #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = FALSE; -#line 2654 "ViewCollection.c" +#line 2676 "ViewCollection.c" } #line 432 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp14_) { -#line 2658 "ViewCollection.c" - Marker* _tmp18_ = NULL; +#line 2680 "ViewCollection.c" + Marker* _tmp18_; #line 433 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp18_ = 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 2664 "ViewCollection.c" +#line 2686 "ViewCollection.c" } #line 417 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 2668 "ViewCollection.c" +#line 2690 "ViewCollection.c" } @@ -2673,9 +2695,9 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec GeeArrayList* to_add = NULL; GeeArrayList* to_remove = NULL; gboolean ordering_changed = FALSE; - GeeArrayList* _tmp82_ = NULL; - GeeArrayList* _tmp86_ = NULL; - gboolean _tmp90_ = FALSE; + GeeArrayList* _tmp82_; + GeeArrayList* _tmp86_; + gboolean _tmp90_; #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" @@ -2688,15 +2710,15 @@ 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 2691 "ViewCollection.c" +#line 2713 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = items; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2715,24 +2737,24 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _object_it = _tmp5_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2718 "ViewCollection.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 2740 "ViewCollection.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; Alteration* alteration = NULL; - GeeMap* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; + GeeMap* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; DataSource* source = NULL; - DataObject* _tmp13_ = NULL; - DataSource* _tmp14_ = NULL; + DataObject* _tmp13_; + DataSource* _tmp14_; ViewCollectionMonitorImpl* monitor = NULL; gboolean ignored = FALSE; - gboolean _tmp38_ = FALSE; + gboolean _tmp38_; gboolean _tmp40_ = FALSE; - ViewCollectionMonitorImpl* _tmp41_ = NULL; + ViewCollectionMonitorImpl* _tmp41_; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp6_ = _object_it; #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2741,7 +2763,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec if (!_tmp7_) { #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2744 "ViewCollection.c" +#line 2766 "ViewCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = _object_it; @@ -2767,15 +2789,15 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec monitor = NULL; #line 447 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ignored = TRUE; -#line 2770 "ViewCollection.c" +#line 2792 "ViewCollection.c" { GeeIterator* _monitor_impl_it = NULL; - GeeHashMultiMap* _tmp15_ = NULL; - DataCollection* _tmp16_ = NULL; - GeeCollection* _tmp17_ = NULL; - GeeCollection* _tmp18_ = NULL; - GeeIterator* _tmp19_ = NULL; - GeeIterator* _tmp20_ = 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; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2794,19 +2816,19 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _monitor_impl_it = _tmp20_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 2797 "ViewCollection.c" - GeeIterator* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; +#line 2819 "ViewCollection.c" + GeeIterator* _tmp21_; + gboolean _tmp22_; ViewCollectionMonitorImpl* monitor_impl = NULL; - GeeIterator* _tmp23_ = NULL; - gpointer _tmp24_ = NULL; + GeeIterator* _tmp23_; + gpointer _tmp24_; gboolean _tmp25_ = FALSE; - ViewCollectionMonitorImpl* _tmp26_ = NULL; - Alteration* _tmp27_ = NULL; - ViewCollectionMonitorImpl* _tmp32_ = NULL; - ViewManager* _tmp33_ = NULL; - DataSource* _tmp34_ = NULL; - gboolean _tmp35_ = FALSE; + ViewCollectionMonitorImpl* _tmp26_; + Alteration* _tmp27_; + ViewCollectionMonitorImpl* _tmp32_; + ViewManager* _tmp33_; + DataSource* _tmp34_; + gboolean _tmp35_; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp21_ = _monitor_impl_it; #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2815,7 +2837,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec if (!_tmp22_) { #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2818 "ViewCollection.c" +#line 2840 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp23_ = _monitor_impl_it; @@ -2829,11 +2851,11 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _tmp27_ = _tmp26_->prereq; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp27_ != NULL) { -#line 2832 "ViewCollection.c" - Alteration* _tmp28_ = NULL; - ViewCollectionMonitorImpl* _tmp29_ = NULL; - Alteration* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; +#line 2854 "ViewCollection.c" + Alteration* _tmp28_; + ViewCollectionMonitorImpl* _tmp29_; + Alteration* _tmp30_; + gboolean _tmp31_; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp28_ = alteration; #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2844,11 +2866,11 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _tmp31_ = alteration_contains_any (_tmp28_, _tmp30_); #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp25_ = !_tmp31_; -#line 2847 "ViewCollection.c" +#line 2869 "ViewCollection.c" } else { #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp25_ = FALSE; -#line 2851 "ViewCollection.c" +#line 2873 "ViewCollection.c" } #line 449 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp25_) { @@ -2856,7 +2878,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _view_collection_monitor_unref0 (monitor_impl); #line 450 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" continue; -#line 2859 "ViewCollection.c" +#line 2881 "ViewCollection.c" } #line 452 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ignored = FALSE; @@ -2870,9 +2892,9 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _tmp35_ = view_manager_include_in_view (_tmp33_, _tmp34_); #line 454 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp35_) { -#line 2873 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp36_ = NULL; - ViewCollectionMonitorImpl* _tmp37_ = NULL; +#line 2895 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp36_; + ViewCollectionMonitorImpl* _tmp37_; #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp36_ = monitor_impl; #line 455 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2885,22 +2907,22 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _view_collection_monitor_unref0 (monitor_impl); #line 457 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 2888 "ViewCollection.c" +#line 2910 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _view_collection_monitor_unref0 (monitor_impl); -#line 2892 "ViewCollection.c" +#line 2914 "ViewCollection.c" } #line 448 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_monitor_impl_it); -#line 2896 "ViewCollection.c" +#line 2918 "ViewCollection.c" } #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp38_ = ignored; #line 461 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp38_) { -#line 2902 "ViewCollection.c" - ViewCollectionMonitorImpl* _tmp39_ = NULL; +#line 2924 "ViewCollection.c" + ViewCollectionMonitorImpl* _tmp39_; #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp39_ = monitor; #line 462 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2915,50 +2937,50 @@ 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 2918 "ViewCollection.c" +#line 2940 "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 2924 "ViewCollection.c" - DataSource* _tmp42_ = NULL; - gboolean _tmp43_ = FALSE; +#line 2946 "ViewCollection.c" + DataSource* _tmp42_; + gboolean _tmp43_; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp42_ = source; #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp43_ = view_collection_has_view_for_source (self, _tmp42_); #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp40_ = !_tmp43_; -#line 2933 "ViewCollection.c" +#line 2955 "ViewCollection.c" } else { #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp40_ = FALSE; -#line 2937 "ViewCollection.c" +#line 2959 "ViewCollection.c" } #line 467 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp40_) { -#line 2941 "ViewCollection.c" - GeeArrayList* _tmp44_ = NULL; - GeeArrayList* _tmp46_ = NULL; - ViewCollectionMonitorImpl* _tmp47_ = NULL; - ViewManager* _tmp48_ = NULL; - DataSource* _tmp49_ = NULL; - DataView* _tmp50_ = NULL; - DataView* _tmp51_ = NULL; +#line 2963 "ViewCollection.c" + GeeArrayList* _tmp44_; + GeeArrayList* _tmp46_; + ViewCollectionMonitorImpl* _tmp47_; + ViewManager* _tmp48_; + DataSource* _tmp49_; + DataView* _tmp50_; + DataView* _tmp51_; #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp44_ = to_add; #line 468 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp44_ == NULL) { -#line 2953 "ViewCollection.c" - GeeArrayList* _tmp45_ = NULL; +#line 2975 "ViewCollection.c" + GeeArrayList* _tmp45_; #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); #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 2961 "ViewCollection.c" +#line 2983 "ViewCollection.c" } #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp46_ = to_add; @@ -2976,50 +2998,50 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_); #line 471 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp51_); -#line 2979 "ViewCollection.c" +#line 3001 "ViewCollection.c" } else { gboolean _tmp52_ = FALSE; - ViewCollectionMonitorImpl* _tmp53_ = NULL; + ViewCollectionMonitorImpl* _tmp53_; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp53_ = monitor; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp53_ == NULL) { -#line 2987 "ViewCollection.c" - DataSource* _tmp54_ = NULL; - gboolean _tmp55_ = FALSE; +#line 3009 "ViewCollection.c" + DataSource* _tmp54_; + gboolean _tmp55_; #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp54_ = 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 2996 "ViewCollection.c" +#line 3018 "ViewCollection.c" } else { #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp52_ = FALSE; -#line 3000 "ViewCollection.c" +#line 3022 "ViewCollection.c" } #line 472 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp52_) { -#line 3004 "ViewCollection.c" - GeeArrayList* _tmp56_ = NULL; - GeeArrayList* _tmp58_ = NULL; - DataSource* _tmp59_ = NULL; - DataView* _tmp60_ = NULL; - DataView* _tmp61_ = NULL; +#line 3026 "ViewCollection.c" + GeeArrayList* _tmp56_; + GeeArrayList* _tmp58_; + DataSource* _tmp59_; + DataView* _tmp60_; + DataView* _tmp61_; #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp56_ = to_remove; #line 473 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp56_ == NULL) { -#line 3014 "ViewCollection.c" - GeeArrayList* _tmp57_ = NULL; +#line 3036 "ViewCollection.c" + GeeArrayList* _tmp57_; #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); #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 3022 "ViewCollection.c" +#line 3044 "ViewCollection.c" } #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp58_ = to_remove; @@ -3033,40 +3055,40 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp61_); #line 476 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp61_); -#line 3036 "ViewCollection.c" +#line 3058 "ViewCollection.c" } else { gboolean _tmp62_ = FALSE; - ViewCollectionMonitorImpl* _tmp63_ = NULL; + ViewCollectionMonitorImpl* _tmp63_; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp63_ = monitor; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp63_ != NULL) { -#line 3044 "ViewCollection.c" - DataSource* _tmp64_ = NULL; - gboolean _tmp65_ = FALSE; +#line 3066 "ViewCollection.c" + DataSource* _tmp64_; + gboolean _tmp65_; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp64_ = source; #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp65_ = view_collection_has_view_for_source (self, _tmp64_); #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp62_ = _tmp65_; -#line 3053 "ViewCollection.c" +#line 3075 "ViewCollection.c" } else { #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp62_ = FALSE; -#line 3057 "ViewCollection.c" +#line 3079 "ViewCollection.c" } #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp62_) { -#line 3061 "ViewCollection.c" +#line 3083 "ViewCollection.c" DataView* view = NULL; - DataSource* _tmp66_ = NULL; - DataView* _tmp67_ = NULL; - DataSet* _tmp68_ = NULL; - DataView* _tmp69_ = NULL; - gboolean _tmp70_ = FALSE; + DataSource* _tmp66_; + DataView* _tmp67_; + DataSet* _tmp68_; + DataView* _tmp69_; + gboolean _tmp70_; gboolean _tmp74_ = FALSE; - DataSet* _tmp75_ = NULL; + DataSet* _tmp75_; #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp66_ = source; #line 478 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3081,10 +3103,10 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _tmp70_ = data_set_contains (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_DATA_OBJECT, DataObject)); #line 480 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp70_) { -#line 3084 "ViewCollection.c" - DataSet* _tmp71_ = NULL; - DataView* _tmp72_ = NULL; - Alteration* _tmp73_ = NULL; +#line 3106 "ViewCollection.c" + DataSet* _tmp71_; + DataView* _tmp72_; + Alteration* _tmp73_; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp71_ = self->priv->selected; #line 481 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3093,34 +3115,34 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _tmp73_ = 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 3096 "ViewCollection.c" +#line 3118 "ViewCollection.c" } #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp75_ = self->priv->visible; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp75_ != NULL) { -#line 3102 "ViewCollection.c" - DataView* _tmp76_ = NULL; - gboolean _tmp77_ = FALSE; +#line 3124 "ViewCollection.c" + DataView* _tmp76_; + gboolean _tmp77_; #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp76_ = 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 3111 "ViewCollection.c" +#line 3133 "ViewCollection.c" } else { #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp74_ = FALSE; -#line 3115 "ViewCollection.c" +#line 3137 "ViewCollection.c" } #line 483 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp74_) { -#line 3119 "ViewCollection.c" - DataSet* _tmp78_ = NULL; - DataView* _tmp79_ = NULL; - Alteration* _tmp80_ = NULL; - gboolean _tmp81_ = FALSE; +#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; #line 484 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3133,12 +3155,12 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec if (_tmp81_) { #line 485 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ordering_changed = TRUE; -#line 3136 "ViewCollection.c" +#line 3158 "ViewCollection.c" } } #line 477 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 3141 "ViewCollection.c" +#line 3163 "ViewCollection.c" } } } @@ -3150,20 +3172,20 @@ 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 3153 "ViewCollection.c" +#line 3175 "ViewCollection.c" } #line 442 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3157 "ViewCollection.c" +#line 3179 "ViewCollection.c" } #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp82_ = to_add; #line 490 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp82_ != NULL) { -#line 3163 "ViewCollection.c" - GeeArrayList* _tmp83_ = NULL; - GeeCollection* _tmp84_ = NULL; - GeeCollection* _tmp85_ = NULL; +#line 3185 "ViewCollection.c" + GeeArrayList* _tmp83_; + GeeCollection* _tmp84_; + GeeCollection* _tmp85_; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp83_ = to_add; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3172,16 +3194,16 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec _tmp85_ = _tmp84_; #line 491 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp85_); -#line 3175 "ViewCollection.c" +#line 3197 "ViewCollection.c" } #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp86_ = to_remove; #line 493 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp86_ != NULL) { -#line 3181 "ViewCollection.c" - GeeArrayList* _tmp87_ = NULL; - Marker* _tmp88_ = NULL; - Marker* _tmp89_ = NULL; +#line 3203 "ViewCollection.c" + GeeArrayList* _tmp87_; + Marker* _tmp88_; + Marker* _tmp89_; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp87_ = to_remove; #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3192,7 +3214,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp89_); #line 494 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp89_); -#line 3195 "ViewCollection.c" +#line 3217 "ViewCollection.c" } #line 496 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp90_ = ordering_changed; @@ -3200,22 +3222,22 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec if (_tmp90_) { #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 3203 "ViewCollection.c" +#line 3225 "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 3209 "ViewCollection.c" +#line 3231 "ViewCollection.c" } static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeIterable* added) { GeeArrayList* to_add = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp19_; + gint _tmp20_; + gint _tmp21_; #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" @@ -3224,11 +3246,11 @@ 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 3227 "ViewCollection.c" +#line 3249 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = added; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3237,18 +3259,18 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI _object_it = _tmp2_; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3240 "ViewCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 3262 "ViewCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; DataSource* source = NULL; - DataObject* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; + DataObject* _tmp7_; + DataSource* _tmp8_; gboolean _tmp9_ = FALSE; - CreateViewPredicate _tmp10_ = NULL; - void* _tmp10__target = NULL; + CreateViewPredicate _tmp10_; + void* _tmp10__target; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = _object_it; #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3257,7 +3279,7 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI if (!_tmp4_) { #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3260 "ViewCollection.c" +#line 3282 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _object_it; @@ -3279,12 +3301,12 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI if (_tmp10_ == NULL) { #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp9_ = TRUE; -#line 3282 "ViewCollection.c" +#line 3304 "ViewCollection.c" } else { - CreateViewPredicate _tmp11_ = NULL; - void* _tmp11__target = NULL; - DataSource* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + CreateViewPredicate _tmp11_; + void* _tmp11__target; + DataSource* _tmp12_; + gboolean _tmp13_; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp11_ = self->priv->should_mirror; #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3295,17 +3317,17 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI _tmp13_ = _tmp11_ (_tmp12_, _tmp11__target); #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp9_ = _tmp13_; -#line 3298 "ViewCollection.c" +#line 3320 "ViewCollection.c" } #line 505 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp9_) { -#line 3302 "ViewCollection.c" - GeeArrayList* _tmp14_ = NULL; - CreateView _tmp15_ = NULL; - void* _tmp15__target = NULL; - DataSource* _tmp16_ = NULL; - DataView* _tmp17_ = NULL; - DataView* _tmp18_ = NULL; +#line 3324 "ViewCollection.c" + GeeArrayList* _tmp14_; + CreateView _tmp15_; + void* _tmp15__target; + DataSource* _tmp16_; + DataView* _tmp17_; + DataView* _tmp18_; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = to_add; #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3322,17 +3344,17 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_); #line 506 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp18_); -#line 3325 "ViewCollection.c" +#line 3347 "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 3331 "ViewCollection.c" +#line 3353 "ViewCollection.c" } #line 502 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3335 "ViewCollection.c" +#line 3357 "ViewCollection.c" } #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp19_ = to_add; @@ -3342,10 +3364,10 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI _tmp21_ = _tmp20_; #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp21_ > 0) { -#line 3345 "ViewCollection.c" - GeeArrayList* _tmp22_ = NULL; - GeeCollection* _tmp23_ = NULL; - GeeCollection* _tmp24_ = NULL; +#line 3367 "ViewCollection.c" + GeeArrayList* _tmp22_; + GeeCollection* _tmp23_; + GeeCollection* _tmp24_; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp22_ = to_add; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3354,18 +3376,18 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI _tmp24_ = _tmp23_; #line 510 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp24_); -#line 3357 "ViewCollection.c" +#line 3379 "ViewCollection.c" } #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); -#line 3361 "ViewCollection.c" +#line 3383 "ViewCollection.c" } static void view_collection_on_mirror_contents_removed (ViewCollection* self, GeeIterable* removed) { Marker* marker = NULL; - Marker* _tmp0_ = NULL; - Marker* _tmp17_ = NULL; + Marker* _tmp0_; + Marker* _tmp17_; #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" @@ -3374,11 +3396,11 @@ 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 3377 "ViewCollection.c" +#line 3399 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = removed; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3387,24 +3409,24 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge _object_it = _tmp2_; #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3390 "ViewCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 3412 "ViewCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; DataView* view = NULL; - DataObject* _tmp7_ = NULL; - DataView* _tmp8_ = NULL; + DataObject* _tmp7_; + DataView* _tmp8_; DataView* our_view = NULL; - DataView* _tmp9_ = NULL; - DataSource* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - DataView* _tmp12_ = NULL; - DataView* _tmp13_ = NULL; - DataView* _tmp14_ = NULL; - Marker* _tmp15_ = NULL; - DataView* _tmp16_ = NULL; + DataView* _tmp9_; + DataSource* _tmp10_; + DataSource* _tmp11_; + DataView* _tmp12_; + DataView* _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" @@ -3413,7 +3435,7 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge if (!_tmp4_) { #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3416 "ViewCollection.c" +#line 3438 "ViewCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _object_it; @@ -3457,11 +3479,11 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge _g_object_unref0 (view); #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 3460 "ViewCollection.c" +#line 3482 "ViewCollection.c" } #line 515 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3464 "ViewCollection.c" +#line 3486 "ViewCollection.c" } #line 524 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = marker; @@ -3469,7 +3491,7 @@ static void view_collection_on_mirror_contents_removed (ViewCollection* self, Ge data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp17_); #line 513 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 3472 "ViewCollection.c" +#line 3494 "ViewCollection.c" } @@ -3477,9 +3499,9 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt ViewCollection * self; GeeArrayList* added_visible = NULL; GeeArrayList* added_selected = NULL; - GeeArrayList* _tmp30_ = NULL; - GeeArrayList* _tmp34_ = NULL; - GeeIterable* _tmp37_ = NULL; + GeeArrayList* _tmp30_; + GeeArrayList* _tmp34_; + GeeIterable* _tmp37_; #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" @@ -3488,11 +3510,11 @@ 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 3491 "ViewCollection.c" +#line 3513 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = added; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3501,26 +3523,26 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _object_it = _tmp1_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3504 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 3526 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; DataView* view = NULL; - DataObject* _tmp6_ = NULL; - DataView* _tmp7_ = NULL; - GeeHashMap* _tmp8_ = NULL; - DataView* _tmp9_ = NULL; - DataSource* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - DataView* _tmp12_ = NULL; + DataObject* _tmp6_; + DataView* _tmp7_; + GeeHashMap* _tmp8_; + DataView* _tmp9_; + DataSource* _tmp10_; + DataSource* _tmp11_; + DataView* _tmp12_; gboolean _tmp13_ = FALSE; - DataView* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + DataView* _tmp14_; + gboolean _tmp15_; gboolean _tmp22_ = FALSE; - DataView* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; + DataView* _tmp23_; + gboolean _tmp24_; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _object_it; #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3529,7 +3551,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt if (!_tmp3_) { #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3532 "ViewCollection.c" +#line 3554 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _object_it; @@ -3563,40 +3585,40 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _tmp15_ = data_view_is_selected (_tmp14_); #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp15_) { -#line 3566 "ViewCollection.c" - DataView* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 3588 "ViewCollection.c" + DataView* _tmp16_; + gboolean _tmp17_; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp16_ = view; #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = data_view_is_visible (_tmp16_); #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp13_ = _tmp17_; -#line 3575 "ViewCollection.c" +#line 3597 "ViewCollection.c" } else { #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp13_ = FALSE; -#line 3579 "ViewCollection.c" +#line 3601 "ViewCollection.c" } #line 536 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp13_) { -#line 3583 "ViewCollection.c" - GeeArrayList* _tmp18_ = NULL; - GeeArrayList* _tmp20_ = NULL; - DataView* _tmp21_ = NULL; +#line 3605 "ViewCollection.c" + GeeArrayList* _tmp18_; + GeeArrayList* _tmp20_; + DataView* _tmp21_; #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp18_ = added_selected; #line 537 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp18_ == NULL) { -#line 3591 "ViewCollection.c" - GeeArrayList* _tmp19_ = NULL; +#line 3613 "ViewCollection.c" + GeeArrayList* _tmp19_; #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); #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 3599 "ViewCollection.c" +#line 3621 "ViewCollection.c" } #line 540 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp20_ = added_selected; @@ -3604,7 +3626,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _tmp21_ = 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 3607 "ViewCollection.c" +#line 3629 "ViewCollection.c" } #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp23_ = view; @@ -3612,37 +3634,37 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _tmp24_ = data_view_is_visible (_tmp23_); #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp24_) { -#line 3615 "ViewCollection.c" - DataSet* _tmp25_ = NULL; +#line 3637 "ViewCollection.c" + DataSet* _tmp25_; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp25_ = self->priv->visible; #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp22_ = _tmp25_ != NULL; -#line 3621 "ViewCollection.c" +#line 3643 "ViewCollection.c" } else { #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp22_ = FALSE; -#line 3625 "ViewCollection.c" +#line 3647 "ViewCollection.c" } #line 544 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp22_) { -#line 3629 "ViewCollection.c" - GeeArrayList* _tmp26_ = NULL; - GeeArrayList* _tmp28_ = NULL; - DataView* _tmp29_ = NULL; +#line 3651 "ViewCollection.c" + GeeArrayList* _tmp26_; + GeeArrayList* _tmp28_; + DataView* _tmp29_; #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp26_ = added_visible; #line 545 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp26_ == NULL) { -#line 3637 "ViewCollection.c" - GeeArrayList* _tmp27_ = NULL; +#line 3659 "ViewCollection.c" + GeeArrayList* _tmp27_; #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); #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 3645 "ViewCollection.c" +#line 3667 "ViewCollection.c" } #line 548 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp28_ = added_visible; @@ -3650,27 +3672,27 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _tmp29_ = 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 3653 "ViewCollection.c" +#line 3675 "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 3659 "ViewCollection.c" +#line 3681 "ViewCollection.c" } #line 532 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3663 "ViewCollection.c" +#line 3685 "ViewCollection.c" } #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp30_ = added_visible; #line 552 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp30_ != NULL) { -#line 3669 "ViewCollection.c" +#line 3691 "ViewCollection.c" gboolean is_added = FALSE; - GeeArrayList* _tmp31_ = NULL; - gboolean _tmp32_ = FALSE; - gboolean _tmp33_ = FALSE; + GeeArrayList* _tmp31_; + gboolean _tmp32_; + gboolean _tmp33_; #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp31_ = added_visible; #line 553 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3681,15 +3703,15 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _tmp33_ = is_added; #line 554 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (_tmp33_, "is_added"); -#line 3684 "ViewCollection.c" +#line 3706 "ViewCollection.c" } #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp34_ = added_selected; #line 557 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp34_ != NULL) { -#line 3690 "ViewCollection.c" - GeeArrayList* _tmp35_ = NULL; - GeeArrayList* _tmp36_ = NULL; +#line 3712 "ViewCollection.c" + GeeArrayList* _tmp35_; + GeeArrayList* _tmp36_; #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp35_ = added_selected; #line 558 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3698,7 +3720,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _tmp36_ = 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 3701 "ViewCollection.c" +#line 3723 "ViewCollection.c" } #line 562 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp37_ = added; @@ -3708,26 +3730,26 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt _g_object_unref0 (added_selected); #line 528 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_visible); -#line 3711 "ViewCollection.c" +#line 3733 "ViewCollection.c" } static void view_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { ViewCollection * self; GeeArrayList* selected_removed = NULL; - GeeArrayList* _tmp42_ = NULL; - GeeIterable* _tmp44_ = NULL; + GeeArrayList* _tmp42_; + GeeIterable* _tmp44_; #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 3726 "ViewCollection.c" +#line 3748 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = removed; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3736,21 +3758,21 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee _object_it = _tmp1_; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3739 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 3761 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; DataView* view = NULL; - DataObject* _tmp6_ = NULL; - DataView* _tmp7_ = NULL; - GeeHashMap* _tmp8_ = NULL; - DataView* _tmp9_ = NULL; - DataSource* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + DataObject* _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; #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3759,7 +3781,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee if (!_tmp3_) { #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 3762 "ViewCollection.c" +#line 3784 "ViewCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _object_it; @@ -3789,20 +3811,20 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee _g_object_unref0 (_tmp11_); #line 575 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp13_) { -#line 3792 "ViewCollection.c" +#line 3814 "ViewCollection.c" gboolean is_removed = FALSE; - GeeHashMap* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; - DataSource* _tmp16_ = NULL; - DataSource* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - DataView* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; + GeeHashMap* _tmp14_; + DataView* _tmp15_; + DataSource* _tmp16_; + DataSource* _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; + DataView* _tmp21_; + gboolean _tmp22_; gboolean _tmp34_ = FALSE; - DataView* _tmp35_ = NULL; - gboolean _tmp36_ = FALSE; + DataView* _tmp35_; + gboolean _tmp36_; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = self->priv->source_map; #line 576 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3829,14 +3851,14 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee _tmp22_ = data_view_is_selected (_tmp21_); #line 579 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp22_) { -#line 3832 "ViewCollection.c" - DataSet* _tmp23_ = NULL; - DataView* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; - DataView* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - DataView* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; +#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" @@ -3855,23 +3877,23 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee _tmp29_ = data_view_is_visible (_tmp28_); #line 583 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp29_) { -#line 3858 "ViewCollection.c" - GeeArrayList* _tmp30_ = NULL; - GeeArrayList* _tmp32_ = NULL; - DataView* _tmp33_ = NULL; +#line 3880 "ViewCollection.c" + GeeArrayList* _tmp30_; + GeeArrayList* _tmp32_; + DataView* _tmp33_; #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp30_ = selected_removed; #line 584 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp30_ == NULL) { -#line 3866 "ViewCollection.c" - GeeArrayList* _tmp31_ = NULL; +#line 3888 "ViewCollection.c" + GeeArrayList* _tmp31_; #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); #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 3874 "ViewCollection.c" +#line 3896 "ViewCollection.c" } #line 587 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp32_ = selected_removed; @@ -3879,7 +3901,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee _tmp33_ = 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 3882 "ViewCollection.c" +#line 3904 "ViewCollection.c" } } #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3888,25 +3910,25 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee _tmp36_ = data_view_is_visible (_tmp35_); #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp36_) { -#line 3891 "ViewCollection.c" - DataSet* _tmp37_ = NULL; +#line 3913 "ViewCollection.c" + DataSet* _tmp37_; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp37_ = self->priv->visible; #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp34_ = _tmp37_ != NULL; -#line 3897 "ViewCollection.c" +#line 3919 "ViewCollection.c" } else { #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp34_ = FALSE; -#line 3901 "ViewCollection.c" +#line 3923 "ViewCollection.c" } #line 591 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp34_) { -#line 3905 "ViewCollection.c" - DataSet* _tmp38_ = NULL; - DataView* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; - gboolean _tmp41_ = FALSE; +#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; #line 592 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3919,32 +3941,32 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee _tmp41_ = is_removed; #line 593 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (_tmp41_, "is_removed"); -#line 3922 "ViewCollection.c" +#line 3944 "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 3929 "ViewCollection.c" +#line 3951 "ViewCollection.c" } #line 568 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 3933 "ViewCollection.c" +#line 3955 "ViewCollection.c" } #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp42_ = selected_removed; #line 598 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp42_ != NULL) { -#line 3939 "ViewCollection.c" - GeeArrayList* _tmp43_ = NULL; +#line 3961 "ViewCollection.c" + GeeArrayList* _tmp43_; #line 599 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp43_ = 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)); #line 604 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_notify_selection_group_altered (self); -#line 3947 "ViewCollection.c" +#line 3969 "ViewCollection.c" } #line 607 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp44_ = removed; @@ -3952,15 +3974,15 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp44_); #line 566 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected_removed); -#line 3955 "ViewCollection.c" +#line 3977 "ViewCollection.c" } static void view_collection_filter_altered_items (ViewCollection* self, GeeCollection* views) { GeeArrayList* to_show = NULL; GeeArrayList* to_hide = NULL; - GeeArrayList* _tmp20_ = NULL; - GeeArrayList* _tmp22_ = NULL; + GeeArrayList* _tmp20_; + GeeArrayList* _tmp22_; #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" @@ -3969,11 +3991,11 @@ 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 3972 "ViewCollection.c" +#line 3994 "ViewCollection.c" { GeeIterator* _view_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = views; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3982,14 +4004,14 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle _view_it = _tmp1_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 3985 "ViewCollection.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 4007 "ViewCollection.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataView* view = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - DataView* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp4_; + gpointer _tmp5_; + DataView* _tmp6_; + gboolean _tmp7_; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _view_it; #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3998,7 +4020,7 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle if (!_tmp3_) { #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4001 "ViewCollection.c" +#line 4023 "ViewCollection.c" } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _view_it; @@ -4012,32 +4034,32 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle _tmp7_ = view_collection_is_in_filter (self, _tmp6_); #line 620 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp7_) { -#line 4015 "ViewCollection.c" - DataView* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 4037 "ViewCollection.c" + DataView* _tmp8_; + gboolean _tmp9_; #line 621 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = 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 4024 "ViewCollection.c" - GeeArrayList* _tmp10_ = NULL; - GeeArrayList* _tmp12_ = NULL; - DataView* _tmp13_ = NULL; +#line 4046 "ViewCollection.c" + GeeArrayList* _tmp10_; + GeeArrayList* _tmp12_; + DataView* _tmp13_; #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp10_ = to_show; #line 622 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp10_ == NULL) { -#line 4032 "ViewCollection.c" - GeeArrayList* _tmp11_ = NULL; +#line 4054 "ViewCollection.c" + GeeArrayList* _tmp11_; #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); #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 4040 "ViewCollection.c" +#line 4062 "ViewCollection.c" } #line 625 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = to_show; @@ -4045,34 +4067,34 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle _tmp13_ = 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 4048 "ViewCollection.c" +#line 4070 "ViewCollection.c" } } else { - DataView* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + DataView* _tmp14_; + gboolean _tmp15_; #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = view; #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp15_ = data_view_is_visible (_tmp14_); #line 628 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp15_) { -#line 4059 "ViewCollection.c" - GeeArrayList* _tmp16_ = NULL; - GeeArrayList* _tmp18_ = NULL; - DataView* _tmp19_ = NULL; +#line 4081 "ViewCollection.c" + GeeArrayList* _tmp16_; + GeeArrayList* _tmp18_; + DataView* _tmp19_; #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp16_ = to_hide; #line 629 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp16_ == NULL) { -#line 4067 "ViewCollection.c" - GeeArrayList* _tmp17_ = NULL; +#line 4089 "ViewCollection.c" + GeeArrayList* _tmp17_; #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); #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 4075 "ViewCollection.c" +#line 4097 "ViewCollection.c" } #line 632 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp18_ = to_hide; @@ -4080,56 +4102,56 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle _tmp19_ = 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 4083 "ViewCollection.c" +#line 4105 "ViewCollection.c" } } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 4088 "ViewCollection.c" +#line 4110 "ViewCollection.c" } #line 619 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 4092 "ViewCollection.c" +#line 4114 "ViewCollection.c" } #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp20_ = to_show; #line 641 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp20_ != NULL) { -#line 4098 "ViewCollection.c" - GeeArrayList* _tmp21_ = NULL; +#line 4120 "ViewCollection.c" + GeeArrayList* _tmp21_; #line 642 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp21_ = 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 4104 "ViewCollection.c" +#line 4126 "ViewCollection.c" } #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp22_ = to_hide; #line 644 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp22_ != NULL) { -#line 4110 "ViewCollection.c" - GeeArrayList* _tmp23_ = NULL; +#line 4132 "ViewCollection.c" + GeeArrayList* _tmp23_; #line 645 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp23_ = 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 4116 "ViewCollection.c" +#line 4138 "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 4122 "ViewCollection.c" +#line 4144 "ViewCollection.c" } static void view_collection_real_items_altered (DataCollection* base, GeeMap* map) { ViewCollection * self; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeMap* _tmp4_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeCollection* _tmp3_; + GeeMap* _tmp4_; #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" @@ -4150,22 +4172,22 @@ static void view_collection_real_items_altered (DataCollection* base, GeeMap* ma _tmp4_ = map; #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 4153 "ViewCollection.c" +#line 4175 "ViewCollection.c" } static void view_collection_real_set_comparator (DataCollection* base, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target) { ViewCollection * self; - DataSet* _tmp0_ = NULL; - Comparator _tmp1_ = NULL; - void* _tmp1__target = NULL; - ComparatorPredicate _tmp2_ = NULL; - void* _tmp2__target = NULL; - DataSet* _tmp3_ = NULL; - Comparator _tmp7_ = NULL; - void* _tmp7__target = NULL; - ComparatorPredicate _tmp8_ = NULL; - void* _tmp8__target = NULL; + DataSet* _tmp0_; + Comparator _tmp1_; + void* _tmp1__target; + ComparatorPredicate _tmp2_; + void* _tmp2__target; + DataSet* _tmp3_; + Comparator _tmp7_; + void* _tmp7__target; + ComparatorPredicate _tmp8_; + void* _tmp8__target; #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" @@ -4184,12 +4206,12 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato _tmp3_ = self->priv->visible; #line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp3_ != NULL) { -#line 4187 "ViewCollection.c" - DataSet* _tmp4_ = NULL; - Comparator _tmp5_ = NULL; - void* _tmp5__target = NULL; - ComparatorPredicate _tmp6_ = NULL; - void* _tmp6__target = 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" @@ -4202,7 +4224,7 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato _tmp6__target = predicate_target; #line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target); -#line 4205 "ViewCollection.c" +#line 4227 "ViewCollection.c" } #line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = comparator; @@ -4214,14 +4236,14 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato _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 4217 "ViewCollection.c" +#line 4239 "ViewCollection.c" } static void view_collection_real_reset_comparator (DataCollection* base) { ViewCollection * self; - DataSet* _tmp0_ = NULL; - DataSet* _tmp1_ = NULL; + DataSet* _tmp0_; + DataSet* _tmp1_; #line 663 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4232,17 +4254,17 @@ 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 4235 "ViewCollection.c" - DataSet* _tmp2_ = NULL; +#line 4257 "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 4241 "ViewCollection.c" +#line 4263 "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 4245 "ViewCollection.c" +#line 4267 "ViewCollection.c" } @@ -4250,16 +4272,16 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) { ViewCollection * self; GeeCollection* result = NULL; GeeCollection* _tmp0_ = NULL; - DataSet* _tmp1_ = NULL; + DataSet* _tmp1_; #line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->visible; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4260 "ViewCollection.c" - DataSet* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; +#line 4282 "ViewCollection.c" + DataSet* _tmp2_; + GeeList* _tmp3_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4268,28 +4290,28 @@ 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 4271 "ViewCollection.c" +#line 4293 "ViewCollection.c" } else { - GeeCollection* _tmp4_ = NULL; + GeeCollection* _tmp4_; #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp0_); #line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_; -#line 4280 "ViewCollection.c" +#line 4302 "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 4286 "ViewCollection.c" +#line 4308 "ViewCollection.c" } GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) { GeeCollection* result = NULL; - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4298,7 +4320,7 @@ GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) { result = _tmp0_; #line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4301 "ViewCollection.c" +#line 4323 "ViewCollection.c" } @@ -4306,42 +4328,42 @@ static gint view_collection_real_get_count (DataCollection* base) { ViewCollection * self; gint result = 0; gint _tmp0_ = 0; - DataSet* _tmp1_ = NULL; + DataSet* _tmp1_; #line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->visible; #line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4316 "ViewCollection.c" - DataSet* _tmp2_ = NULL; - gint _tmp3_ = 0; +#line 4338 "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 4325 "ViewCollection.c" +#line 4347 "ViewCollection.c" } else { - gint _tmp4_ = 0; + 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 4332 "ViewCollection.c" +#line 4354 "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 4338 "ViewCollection.c" +#line 4360 "ViewCollection.c" } gint view_collection_get_unfiltered_count (ViewCollection* self) { gint result = 0; - gint _tmp0_ = 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" @@ -4350,7 +4372,7 @@ gint view_collection_get_unfiltered_count (ViewCollection* self) { result = _tmp0_; #line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4353 "ViewCollection.c" +#line 4375 "ViewCollection.c" } @@ -4358,17 +4380,17 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index ViewCollection * self; DataObject* result = NULL; DataObject* _tmp0_ = NULL; - DataSet* _tmp1_ = NULL; + DataSet* _tmp1_; #line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->visible; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp1_ != NULL) { -#line 4368 "ViewCollection.c" - DataSet* _tmp2_ = NULL; - gint _tmp3_ = 0; - DataObject* _tmp4_ = NULL; +#line 4390 "ViewCollection.c" + DataSet* _tmp2_; + gint _tmp3_; + DataObject* _tmp4_; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->visible; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4379,10 +4401,10 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index _g_object_unref0 (_tmp0_); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_; -#line 4382 "ViewCollection.c" +#line 4404 "ViewCollection.c" } else { - gint _tmp5_ = 0; - DataObject* _tmp6_ = NULL; + gint _tmp5_; + DataObject* _tmp6_; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = index; #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4391,13 +4413,13 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index _g_object_unref0 (_tmp0_); #line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp6_; -#line 4394 "ViewCollection.c" +#line 4416 "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 4400 "ViewCollection.c" +#line 4422 "ViewCollection.c" } @@ -4405,7 +4427,7 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj ViewCollection * self; gint result = 0; gint _tmp0_ = 0; - DataSet* _tmp1_ = NULL; + DataSet* _tmp1_; #line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection); #line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4414,10 +4436,10 @@ 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 4417 "ViewCollection.c" - DataSet* _tmp2_ = NULL; - DataObject* _tmp3_ = NULL; - gint _tmp4_ = 0; +#line 4439 "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" @@ -4426,33 +4448,33 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj _tmp4_ = data_set_index_of (_tmp2_, _tmp3_); #line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = _tmp4_; -#line 4429 "ViewCollection.c" +#line 4451 "ViewCollection.c" } else { - DataObject* _tmp5_ = NULL; - gint _tmp6_ = 0; + 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 4439 "ViewCollection.c" +#line 4461 "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 4445 "ViewCollection.c" +#line 4467 "ViewCollection.c" } static gboolean view_collection_real_contains (DataCollection* base, DataObject* object) { ViewCollection * self; gboolean result = FALSE; - DataObject* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - DataObject* _tmp2_ = NULL; - gboolean _tmp3_ = 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" @@ -4467,7 +4489,7 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject* result = FALSE; #line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4470 "ViewCollection.c" +#line 4492 "ViewCollection.c" } #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = object; @@ -4477,39 +4499,39 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject* result = _tmp3_; #line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4480 "ViewCollection.c" +#line 4502 "ViewCollection.c" } static DataView* view_collection_real_get_first (ViewCollection* self) { DataView* result = NULL; DataView* _tmp0_ = NULL; - gint _tmp1_ = 0; + 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 4492 "ViewCollection.c" - DataObject* _tmp2_ = NULL; +#line 4514 "ViewCollection.c" + DataObject* _tmp2_; #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); #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 4500 "ViewCollection.c" +#line 4522 "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 4506 "ViewCollection.c" +#line 4528 "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 4512 "ViewCollection.c" +#line 4534 "ViewCollection.c" } @@ -4518,7 +4540,7 @@ DataView* view_collection_get_first (ViewCollection* self) { 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 4521 "ViewCollection.c" +#line 4543 "ViewCollection.c" } @@ -4534,12 +4556,12 @@ DataView* view_collection_get_first (ViewCollection* self) { */ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self) { DataView* result = NULL; - gint _tmp0_ = 0; + gint _tmp0_; DataView* dv = NULL; - DataView* _tmp1_ = NULL; + DataView* _tmp1_; gint num_views = 0; - gint _tmp2_ = 0; - DataView* _tmp17_ = NULL; + 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)); #line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4548,7 +4570,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self result = NULL; #line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4551 "ViewCollection.c" +#line 4573 "ViewCollection.c" } #line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = view_collection_get_first (self); @@ -4560,23 +4582,23 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self num_views = _tmp2_; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4563 "ViewCollection.c" +#line 4585 "ViewCollection.c" gboolean _tmp3_ = FALSE; - DataView* _tmp4_ = NULL; + DataView* _tmp4_; MediaSource* tmp = NULL; - DataView* _tmp8_ = NULL; - DataSource* _tmp9_ = NULL; - MediaSource* _tmp10_ = NULL; + DataView* _tmp8_; + DataSource* _tmp9_; + MediaSource* _tmp10_; gboolean _tmp11_ = FALSE; - MediaSource* _tmp12_ = NULL; + MediaSource* _tmp12_; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = dv; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp4_ != NULL) { -#line 4576 "ViewCollection.c" - DataView* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 4598 "ViewCollection.c" + DataView* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = dv; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4585,17 +4607,17 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self _tmp7_ = num_views; #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = _tmp6_ < (_tmp7_ - 1); -#line 4588 "ViewCollection.c" +#line 4610 "ViewCollection.c" } else { #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = FALSE; -#line 4592 "ViewCollection.c" +#line 4614 "ViewCollection.c" } #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!_tmp3_) { #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4598 "ViewCollection.c" +#line 4620 "ViewCollection.c" } #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = dv; @@ -4607,7 +4629,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self if (_tmp10_ == NULL) { #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp9_); -#line 4610 "ViewCollection.c" +#line 4632 "ViewCollection.c" } #line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" tmp = _tmp10_; @@ -4615,20 +4637,20 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self _tmp12_ = tmp; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp12_ != NULL) { -#line 4618 "ViewCollection.c" - MediaSource* _tmp13_ = NULL; - Rating _tmp14_ = 0; +#line 4640 "ViewCollection.c" + MediaSource* _tmp13_; + Rating _tmp14_; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp13_ = tmp; #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = media_source_get_rating (_tmp13_); #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp11_ = _tmp14_ != RATING_REJECTED; -#line 4627 "ViewCollection.c" +#line 4649 "ViewCollection.c" } else { #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp11_ = FALSE; -#line 4631 "ViewCollection.c" +#line 4653 "ViewCollection.c" } #line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp11_) { @@ -4638,10 +4660,10 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self _g_object_unref0 (tmp); #line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4641 "ViewCollection.c" +#line 4663 "ViewCollection.c" } else { - DataView* _tmp15_ = NULL; - DataView* _tmp16_ = NULL; + DataView* _tmp15_; + DataView* _tmp16_; #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp15_ = dv; #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4650,11 +4672,11 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self _g_object_unref0 (dv); #line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dv = _tmp16_; -#line 4653 "ViewCollection.c" +#line 4675 "ViewCollection.c" } #line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (tmp); -#line 4657 "ViewCollection.c" +#line 4679 "ViewCollection.c" } #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = view_collection_get_first (self); @@ -4664,7 +4686,7 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self _g_object_unref0 (dv); #line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4667 "ViewCollection.c" +#line 4689 "ViewCollection.c" } @@ -4673,21 +4695,21 @@ DataView* view_collection_get_first_unrejected (ViewCollection* self) { 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 4676 "ViewCollection.c" +#line 4698 "ViewCollection.c" } static DataView* view_collection_real_get_last (ViewCollection* self) { DataView* result = NULL; DataView* _tmp0_ = NULL; - gint _tmp1_ = 0; + 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 4688 "ViewCollection.c" - gint _tmp2_ = 0; - DataObject* _tmp3_ = NULL; +#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)); #line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4696,19 +4718,19 @@ static DataView* view_collection_real_get_last (ViewCollection* self) { _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 4699 "ViewCollection.c" +#line 4721 "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 4705 "ViewCollection.c" +#line 4727 "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 4711 "ViewCollection.c" +#line 4733 "ViewCollection.c" } @@ -4717,22 +4739,22 @@ DataView* view_collection_get_last (ViewCollection* self) { 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 4720 "ViewCollection.c" +#line 4742 "ViewCollection.c" } static DataView* view_collection_real_get_next (ViewCollection* self, DataView* view) { DataView* result = NULL; - gint _tmp0_ = 0; + gint _tmp0_; gint index = 0; - DataView* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - DataObject* _tmp8_ = NULL; + DataView* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + DataObject* _tmp8_; #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" @@ -4743,7 +4765,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView* result = NULL; #line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4746 "ViewCollection.c" +#line 4768 "ViewCollection.c" } #line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = view; @@ -4759,7 +4781,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView* result = NULL; #line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4762 "ViewCollection.c" +#line 4784 "ViewCollection.c" } #line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = index; @@ -4773,7 +4795,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView* if (_tmp5_ >= _tmp6_) { #line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" index = 0; -#line 4776 "ViewCollection.c" +#line 4798 "ViewCollection.c" } #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = index; @@ -4783,7 +4805,7 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView* result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); #line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4786 "ViewCollection.c" +#line 4808 "ViewCollection.c" } @@ -4792,21 +4814,21 @@ DataView* view_collection_get_next (ViewCollection* self, DataView* view) { 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 4795 "ViewCollection.c" +#line 4817 "ViewCollection.c" } static DataView* view_collection_real_get_previous (ViewCollection* self, DataView* view) { DataView* result = NULL; - gint _tmp0_ = 0; + gint _tmp0_; gint index = 0; - DataView* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp7_ = 0; - DataObject* _tmp8_ = NULL; + DataView* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; + gint _tmp7_; + DataObject* _tmp8_; #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" @@ -4817,7 +4839,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi result = NULL; #line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4820 "ViewCollection.c" +#line 4842 "ViewCollection.c" } #line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = view; @@ -4833,7 +4855,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi result = NULL; #line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4836 "ViewCollection.c" +#line 4858 "ViewCollection.c" } #line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = index; @@ -4843,13 +4865,13 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi _tmp5_ = index; #line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp5_ < 0) { -#line 4846 "ViewCollection.c" - gint _tmp6_ = 0; +#line 4868 "ViewCollection.c" + gint _tmp6_; #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 4852 "ViewCollection.c" +#line 4874 "ViewCollection.c" } #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = index; @@ -4859,7 +4881,7 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); #line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4862 "ViewCollection.c" +#line 4884 "ViewCollection.c" } @@ -4868,24 +4890,24 @@ DataView* view_collection_get_previous (ViewCollection* self, DataView* view) { 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 4871 "ViewCollection.c" +#line 4893 "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_ = NULL; - DataView* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; + DataSource* _tmp0_; + DataView* _tmp1_; + DataView* _tmp2_; DataView* next_view = NULL; - DataView* _tmp3_ = NULL; - DataView* _tmp4_ = NULL; + DataView* _tmp3_; + DataView* _tmp4_; DataView* prev_view = NULL; - DataView* _tmp19_ = NULL; - DataView* _tmp20_ = NULL; + DataView* _tmp19_; + DataView* _tmp20_; #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" @@ -4916,25 +4938,25 @@ 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 4919 "ViewCollection.c" +#line 4941 "ViewCollection.c" } else { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); -#line 4923 "ViewCollection.c" +#line 4945 "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 4929 "ViewCollection.c" +#line 4951 "ViewCollection.c" } else { #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); -#line 4933 "ViewCollection.c" +#line 4955 "ViewCollection.c" } #line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 4937 "ViewCollection.c" +#line 4959 "ViewCollection.c" } #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = home_view; @@ -4944,13 +4966,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour next_view = _tmp4_; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 4947 "ViewCollection.c" - DataView* _tmp5_ = NULL; - DataView* _tmp6_ = NULL; +#line 4969 "ViewCollection.c" + DataView* _tmp5_; + DataView* _tmp6_; gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; - DataView* _tmp17_ = NULL; - DataView* _tmp18_ = NULL; + const gchar* _tmp8_; + DataView* _tmp17_; + DataView* _tmp18_; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = next_view; #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4959,7 +4981,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (!(_tmp5_ != _tmp6_)) { #line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 4962 "ViewCollection.c" +#line 4984 "ViewCollection.c" } #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = type_selector; @@ -4967,14 +4989,14 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (_tmp8_ == NULL) { #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = TRUE; -#line 4970 "ViewCollection.c" +#line 4992 "ViewCollection.c" } else { - DataView* _tmp9_ = NULL; - DataSource* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + 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; #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4993,13 +5015,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour _g_free0 (_tmp13_); #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp11_); -#line 4996 "ViewCollection.c" +#line 5018 "ViewCollection.c" } #line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp7_) { -#line 5000 "ViewCollection.c" - DataView* _tmp15_ = NULL; - DataSource* _tmp16_ = NULL; +#line 5022 "ViewCollection.c" + DataView* _tmp15_; + DataSource* _tmp16_; #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp15_ = next_view; #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5010,7 +5032,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour _vala_next = _tmp16_; #line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5013 "ViewCollection.c" +#line 5035 "ViewCollection.c" } #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = next_view; @@ -5020,7 +5042,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour _g_object_unref0 (next_view); #line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" next_view = _tmp18_; -#line 5023 "ViewCollection.c" +#line 5045 "ViewCollection.c" } #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp19_ = home_view; @@ -5030,13 +5052,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour prev_view = _tmp20_; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5033 "ViewCollection.c" - DataView* _tmp21_ = NULL; - DataView* _tmp22_ = NULL; +#line 5055 "ViewCollection.c" + DataView* _tmp21_; + DataView* _tmp22_; gboolean _tmp23_ = FALSE; - const gchar* _tmp24_ = NULL; - DataView* _tmp33_ = NULL; - DataView* _tmp34_ = NULL; + const gchar* _tmp24_; + DataView* _tmp33_; + DataView* _tmp34_; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp21_ = prev_view; #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5045,7 +5067,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (!(_tmp21_ != _tmp22_)) { #line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5048 "ViewCollection.c" +#line 5070 "ViewCollection.c" } #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp24_ = type_selector; @@ -5053,14 +5075,14 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour if (_tmp24_ == NULL) { #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp23_ = TRUE; -#line 5056 "ViewCollection.c" +#line 5078 "ViewCollection.c" } else { - DataView* _tmp25_ = NULL; - DataSource* _tmp26_ = NULL; - DataSource* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; + 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; #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5079,13 +5101,13 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour _g_free0 (_tmp29_); #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp27_); -#line 5082 "ViewCollection.c" +#line 5104 "ViewCollection.c" } #line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp23_) { -#line 5086 "ViewCollection.c" - DataView* _tmp31_ = NULL; - DataSource* _tmp32_ = NULL; +#line 5108 "ViewCollection.c" + DataView* _tmp31_; + DataSource* _tmp32_; #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp31_ = prev_view; #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5096,7 +5118,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour _vala_prev = _tmp32_; #line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5099 "ViewCollection.c" +#line 5121 "ViewCollection.c" } #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp33_ = prev_view; @@ -5106,7 +5128,7 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour _g_object_unref0 (prev_view); #line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" prev_view = _tmp34_; -#line 5109 "ViewCollection.c" +#line 5131 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5120,43 +5142,43 @@ 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 5123 "ViewCollection.c" +#line 5145 "ViewCollection.c" } else { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_next); -#line 5127 "ViewCollection.c" +#line 5149 "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 5133 "ViewCollection.c" +#line 5155 "ViewCollection.c" } else { #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_vala_prev); -#line 5137 "ViewCollection.c" +#line 5159 "ViewCollection.c" } #line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5141 "ViewCollection.c" +#line 5163 "ViewCollection.c" } GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename) { GeeSet* result = NULL; GeeSet* neighbors = NULL; - GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp0_; DataSource* next = NULL; DataSource* prev = NULL; - DataSource* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + DataSource* _tmp1_; + const gchar* _tmp2_; DataSource* _tmp3_ = NULL; DataSource* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - DataSource* _tmp6_ = NULL; - DataSource* _tmp16_ = NULL; - GeeSet* _tmp26_ = NULL; - DataSource* _tmp27_ = NULL; + gboolean _tmp5_; + DataSource* _tmp6_; + DataSource* _tmp16_; + GeeSet* _tmp26_; + DataSource* _tmp27_; #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" @@ -5189,22 +5211,22 @@ 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 5192 "ViewCollection.c" +#line 5214 "ViewCollection.c" } #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp6_ = next; #line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp6_ != NULL) { -#line 5198 "ViewCollection.c" - GeeSet* _tmp7_ = NULL; - DataSource* _tmp8_ = NULL; +#line 5220 "ViewCollection.c" + GeeSet* _tmp7_; + DataSource* _tmp8_; DataSource* next_next = NULL; DataSource* next_prev = NULL; - DataSource* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + DataSource* _tmp9_; + const gchar* _tmp10_; DataSource* _tmp11_ = NULL; DataSource* _tmp12_ = NULL; - DataSource* _tmp13_ = NULL; + DataSource* _tmp13_; #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = neighbors; #line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5229,37 +5251,37 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource _tmp13_ = next_next; #line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp13_ != NULL) { -#line 5232 "ViewCollection.c" - GeeSet* _tmp14_ = NULL; - DataSource* _tmp15_ = NULL; +#line 5254 "ViewCollection.c" + GeeSet* _tmp14_; + DataSource* _tmp15_; #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = neighbors; #line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp15_ = 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 5241 "ViewCollection.c" +#line 5263 "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 5247 "ViewCollection.c" +#line 5269 "ViewCollection.c" } #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp16_ = prev; #line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp16_ != NULL) { -#line 5253 "ViewCollection.c" - GeeSet* _tmp17_ = NULL; - DataSource* _tmp18_ = NULL; +#line 5275 "ViewCollection.c" + GeeSet* _tmp17_; + DataSource* _tmp18_; DataSource* next_prev = NULL; DataSource* prev_prev = NULL; - DataSource* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + DataSource* _tmp19_; + const gchar* _tmp20_; DataSource* _tmp21_ = NULL; DataSource* _tmp22_ = NULL; - DataSource* _tmp23_ = NULL; + DataSource* _tmp23_; #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = neighbors; #line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5284,22 +5306,22 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource _tmp23_ = prev_prev; #line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp23_ != NULL) { -#line 5287 "ViewCollection.c" - GeeSet* _tmp24_ = NULL; - DataSource* _tmp25_ = NULL; +#line 5309 "ViewCollection.c" + GeeSet* _tmp24_; + DataSource* _tmp25_; #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp24_ = neighbors; #line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp25_ = 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 5296 "ViewCollection.c" +#line 5318 "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 5302 "ViewCollection.c" +#line 5324 "ViewCollection.c" } #line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp26_ = neighbors; @@ -5315,19 +5337,19 @@ 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 5318 "ViewCollection.c" +#line 5340 "ViewCollection.c" } static void view_collection_add_many_selected (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; gboolean added = FALSE; - DataSet* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; + DataSet* _tmp11_; + GeeCollection* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; #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" @@ -5342,12 +5364,12 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti if (_tmp2_ == 0) { #line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5345 "ViewCollection.c" +#line 5367 "ViewCollection.c" } { GeeIterator* _view_it = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = views; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5356,14 +5378,14 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti _view_it = _tmp4_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 5359 "ViewCollection.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 5381 "ViewCollection.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; DataView* view = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - DataView* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataView* _tmp9_; + gboolean _tmp10_; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _view_it; #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5372,7 +5394,7 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti if (!_tmp6_) { #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5375 "ViewCollection.c" +#line 5397 "ViewCollection.c" } #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = _view_it; @@ -5388,11 +5410,11 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti _vala_assert (_tmp10_, "view.is_visible()"); #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 5391 "ViewCollection.c" +#line 5413 "ViewCollection.c" } #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 5395 "ViewCollection.c" +#line 5417 "ViewCollection.c" } #line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp11_ = self->priv->selected; @@ -5406,19 +5428,19 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti _tmp14_ = added; #line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (_tmp14_, "added"); -#line 5409 "ViewCollection.c" +#line 5431 "ViewCollection.c" } static void view_collection_remove_many_selected (ViewCollection* self, GeeCollection* views) { - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; gboolean removed = FALSE; - DataSet* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; + DataSet* _tmp3_; + GeeCollection* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; #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" @@ -5433,7 +5455,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle if (_tmp2_ == 0) { #line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5436 "ViewCollection.c" +#line 5458 "ViewCollection.c" } #line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = self->priv->selected; @@ -5447,7 +5469,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle _tmp6_ = removed; #line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (_tmp6_, "removed"); -#line 5450 "ViewCollection.c" +#line 5472 "ViewCollection.c" } @@ -5456,18 +5478,18 @@ static gboolean _view_collection_select_item_marked_action (DataObject* object, result = view_collection_select_item ((ViewCollection*) self, object, user); #line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5459 "ViewCollection.c" +#line 5481 "ViewCollection.c" } void view_collection_select_marked (ViewCollection* self, Marker* marker) { GeeArrayList* selected = NULL; - GeeArrayList* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeArrayList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeArrayList* _tmp0_; + Marker* _tmp1_; + GeeArrayList* _tmp2_; + GeeArrayList* _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" @@ -5490,9 +5512,9 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) { _tmp5_ = _tmp4_; #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp5_ > 0) { -#line 5493 "ViewCollection.c" - GeeArrayList* _tmp6_ = NULL; - GeeArrayList* _tmp7_ = NULL; +#line 5515 "ViewCollection.c" + GeeArrayList* _tmp6_; + GeeArrayList* _tmp7_; #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp6_ = selected; #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5501,17 +5523,17 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) { _tmp7_ = 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 5504 "ViewCollection.c" +#line 5526 "ViewCollection.c" } #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected); -#line 5508 "ViewCollection.c" +#line 5530 "ViewCollection.c" } void view_collection_select_all (ViewCollection* self) { Marker* marker = NULL; - Marker* _tmp0_ = NULL; + Marker* _tmp0_; #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (self)); #line 882 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5524,20 +5546,20 @@ 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 5527 "ViewCollection.c" +#line 5549 "ViewCollection.c" } static gboolean view_collection_select_item (ViewCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - DataView* _tmp9_ = NULL; - DataView* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + DataObject* _tmp0_; + DataView* _tmp1_; + DataView* _tmp2_; + gboolean _tmp3_; + DataView* _tmp9_; + DataView* _tmp10_; + gboolean _tmp11_; #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" @@ -5556,19 +5578,19 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o _tmp3_ = data_view_is_selected (_tmp2_); #line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp3_) { -#line 5559 "ViewCollection.c" - DataView* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 5581 "ViewCollection.c" + DataView* _tmp4_; + gboolean _tmp5_; #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = view; #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = data_view_is_visible (_tmp4_); #line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp5_) { -#line 5568 "ViewCollection.c" - DataSet* _tmp6_ = NULL; - DataView* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; +#line 5590 "ViewCollection.c" + DataSet* _tmp6_; + DataView* _tmp7_; + gboolean _tmp8_; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp6_ = self->priv->selected; #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5577,7 +5599,7 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o _tmp8_ = data_set_contains (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (_tmp8_, "selected.contains(view)"); -#line 5580 "ViewCollection.c" +#line 5602 "ViewCollection.c" } #line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5585,7 +5607,7 @@ 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 5588 "ViewCollection.c" +#line 5610 "ViewCollection.c" } #line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp9_ = view; @@ -5597,16 +5619,16 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o _tmp11_ = data_view_is_visible (_tmp10_); #line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp11_) { -#line 5600 "ViewCollection.c" - GObject* _tmp12_ = NULL; - DataView* _tmp13_ = NULL; +#line 5622 "ViewCollection.c" + GObject* _tmp12_; + DataView* _tmp13_; #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = user; #line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp13_ = 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 5609 "ViewCollection.c" +#line 5631 "ViewCollection.c" } #line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -5614,7 +5636,7 @@ 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 5617 "ViewCollection.c" +#line 5639 "ViewCollection.c" } @@ -5623,18 +5645,18 @@ static gboolean _view_collection_unselect_item_marked_action (DataObject* object result = view_collection_unselect_item ((ViewCollection*) self, object, user); #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5626 "ViewCollection.c" +#line 5648 "ViewCollection.c" } void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { GeeArrayList* unselected = NULL; - GeeArrayList* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeArrayList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeArrayList* _tmp0_; + Marker* _tmp1_; + GeeArrayList* _tmp2_; + GeeArrayList* _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" @@ -5657,9 +5679,9 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { _tmp5_ = _tmp4_; #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp5_ > 0) { -#line 5660 "ViewCollection.c" - GeeArrayList* _tmp6_ = NULL; - GeeArrayList* _tmp7_ = NULL; +#line 5682 "ViewCollection.c" + GeeArrayList* _tmp6_; + GeeArrayList* _tmp7_; #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp6_ = unselected; #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5668,23 +5690,23 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { _tmp7_ = 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 5671 "ViewCollection.c" +#line 5693 "ViewCollection.c" } #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 5675 "ViewCollection.c" +#line 5697 "ViewCollection.c" } void view_collection_unselect_all (ViewCollection* self) { - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 0; + DataSet* _tmp0_; + gint _tmp1_; Marker* marker = NULL; - Marker* _tmp2_ = NULL; - Marker* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - GeeList* _tmp5_ = NULL; - Marker* _tmp6_ = NULL; + Marker* _tmp2_; + Marker* _tmp3_; + GeeList* _tmp4_; + GeeList* _tmp5_; + Marker* _tmp6_; #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" @@ -5695,7 +5717,7 @@ void view_collection_unselect_all (ViewCollection* self) { if (_tmp1_ == 0) { #line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return; -#line 5698 "ViewCollection.c" +#line 5720 "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)); @@ -5717,14 +5739,14 @@ void view_collection_unselect_all (ViewCollection* self) { view_collection_unselect_marked (self, _tmp6_); #line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5720 "ViewCollection.c" +#line 5742 "ViewCollection.c" } void view_collection_unselect_all_but (ViewCollection* self, DataView* exception) { Marker* marker = NULL; - Marker* _tmp0_ = NULL; - Marker* _tmp15_ = NULL; + Marker* _tmp0_; + Marker* _tmp15_; #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" @@ -5733,13 +5755,13 @@ 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 5736 "ViewCollection.c" +#line 5758 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; + GeeIterator* _tmp4_; #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection)); #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5754,17 +5776,17 @@ 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 5757 "ViewCollection.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 5779 "ViewCollection.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; DataView* view = NULL; - DataObject* _tmp9_ = NULL; - DataView* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - DataView* _tmp12_ = NULL; + DataObject* _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" @@ -5773,7 +5795,7 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception if (!_tmp6_) { #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 5776 "ViewCollection.c" +#line 5798 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = _object_it; @@ -5793,26 +5815,26 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception _tmp12_ = exception; #line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp11_ != _tmp12_) { -#line 5796 "ViewCollection.c" - Marker* _tmp13_ = NULL; - DataView* _tmp14_ = NULL; +#line 5818 "ViewCollection.c" + Marker* _tmp13_; + DataView* _tmp14_; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp13_ = marker; #line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = 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 5805 "ViewCollection.c" +#line 5827 "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 5811 "ViewCollection.c" +#line 5833 "ViewCollection.c" } #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 5815 "ViewCollection.c" +#line 5837 "ViewCollection.c" } #line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp15_ = marker; @@ -5820,20 +5842,20 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception view_collection_unselect_marked (self, _tmp15_); #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (marker); -#line 5823 "ViewCollection.c" +#line 5845 "ViewCollection.c" } static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - DataView* _tmp7_ = NULL; - GObject* _tmp8_ = NULL; - DataView* _tmp9_ = NULL; + DataObject* _tmp0_; + DataView* _tmp1_; + DataView* _tmp2_; + gboolean _tmp3_; + DataView* _tmp7_; + GObject* _tmp8_; + DataView* _tmp9_; #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" @@ -5852,10 +5874,10 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* _tmp3_ = data_view_is_selected (_tmp2_); #line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!_tmp3_) { -#line 5855 "ViewCollection.c" - DataSet* _tmp4_ = NULL; - DataView* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 5877 "ViewCollection.c" + DataSet* _tmp4_; + DataView* _tmp5_; + gboolean _tmp6_; #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = self->priv->selected; #line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5870,7 +5892,7 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* _g_object_unref0 (view); #line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5873 "ViewCollection.c" +#line 5895 "ViewCollection.c" } #line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = view; @@ -5888,17 +5910,17 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject* _g_object_unref0 (view); #line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5891 "ViewCollection.c" +#line 5913 "ViewCollection.c" } void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* unselect, Marker* select) { GeeArrayList* unselected = NULL; - GeeArrayList* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + Marker* _tmp1_; GeeArrayList* selected = NULL; - GeeArrayList* _tmp2_ = NULL; - Marker* _tmp3_ = NULL; + GeeArrayList* _tmp2_; + Marker* _tmp3_; #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" @@ -5931,7 +5953,7 @@ 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 5934 "ViewCollection.c" +#line 5956 "ViewCollection.c" } @@ -5940,18 +5962,18 @@ static gboolean _view_collection_toggle_item_marked_action (DataObject* object, result = view_collection_toggle_item ((ViewCollection*) self, object, user); #line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 5943 "ViewCollection.c" +#line 5965 "ViewCollection.c" } void view_collection_toggle_marked (ViewCollection* self, Marker* marker) { ViewCollectionToggleLists* lists = NULL; - ViewCollectionToggleLists* _tmp0_ = NULL; - Marker* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeArrayList* _tmp3_ = NULL; - GeeArrayList* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; + ViewCollectionToggleLists* _tmp0_; + Marker* _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" @@ -5980,20 +6002,20 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) { 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)); #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (lists); -#line 5983 "ViewCollection.c" +#line 6005 "ViewCollection.c" } static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; DataView* view = NULL; - DataObject* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; + DataObject* _tmp0_; + DataView* _tmp1_; ViewCollectionToggleLists* lists = NULL; - GObject* _tmp2_ = NULL; - ViewCollectionToggleLists* _tmp3_ = NULL; - DataView* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GObject* _tmp2_; + ViewCollectionToggleLists* _tmp3_; + DataView* _tmp4_; + gboolean _tmp5_; #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" @@ -6018,19 +6040,19 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o _tmp5_ = data_view_internal_toggle (_tmp4_); #line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp5_) { -#line 6021 "ViewCollection.c" - DataView* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 6043 "ViewCollection.c" + DataView* _tmp6_; + gboolean _tmp7_; #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp6_ = view; #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = data_view_is_visible (_tmp6_); #line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp7_) { -#line 6030 "ViewCollection.c" - ViewCollectionToggleLists* _tmp8_ = NULL; - GeeArrayList* _tmp9_ = NULL; - DataView* _tmp10_ = NULL; +#line 6052 "ViewCollection.c" + ViewCollectionToggleLists* _tmp8_; + GeeArrayList* _tmp9_; + DataView* _tmp10_; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = lists; #line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6039,12 +6061,12 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o _tmp10_ = 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 6042 "ViewCollection.c" +#line 6064 "ViewCollection.c" } } else { - ViewCollectionToggleLists* _tmp11_ = NULL; - GeeArrayList* _tmp12_ = NULL; - DataView* _tmp13_ = NULL; + ViewCollectionToggleLists* _tmp11_; + GeeArrayList* _tmp12_; + DataView* _tmp13_; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp11_ = lists; #line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6053,7 +6075,7 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o _tmp13_ = 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 6056 "ViewCollection.c" +#line 6078 "ViewCollection.c" } #line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = TRUE; @@ -6063,14 +6085,14 @@ 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 6066 "ViewCollection.c" +#line 6088 "ViewCollection.c" } gint view_collection_get_selected_count (ViewCollection* self) { gint result = 0; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 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" @@ -6081,14 +6103,14 @@ gint view_collection_get_selected_count (ViewCollection* self) { result = _tmp1_; #line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6084 "ViewCollection.c" +#line 6106 "ViewCollection.c" } GeeList* view_collection_get_selected (ViewCollection* self) { GeeList* result = NULL; - DataSet* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + DataSet* _tmp0_; + GeeList* _tmp1_; #line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6099,15 +6121,15 @@ 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 6102 "ViewCollection.c" +#line 6124 "ViewCollection.c" } DataView* view_collection_get_selected_at (ViewCollection* self, gint index) { DataView* result = NULL; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 0; - DataObject* _tmp2_ = NULL; + DataSet* _tmp0_; + gint _tmp1_; + DataObject* _tmp2_; #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" @@ -6120,14 +6142,14 @@ DataView* view_collection_get_selected_at (ViewCollection* self, gint index) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); #line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6123 "ViewCollection.c" +#line 6145 "ViewCollection.c" } static gboolean view_collection_is_visible (ViewCollection* self, DataView* view) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - DataSet* _tmp1_ = NULL; + DataSet* _tmp1_; #line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE); #line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6136,10 +6158,10 @@ 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 6139 "ViewCollection.c" - DataSet* _tmp2_ = NULL; - DataView* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 6161 "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" @@ -6148,29 +6170,29 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view _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 6151 "ViewCollection.c" +#line 6173 "ViewCollection.c" } else { #line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = TRUE; -#line 6155 "ViewCollection.c" +#line 6177 "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 6161 "ViewCollection.c" +#line 6183 "ViewCollection.c" } static gboolean view_collection_add_many_visible (ViewCollection* self, GeeCollection* many) { gboolean result = FALSE; - DataSet* _tmp0_ = NULL; - DataSet* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - DataSet* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + DataSet* _tmp0_; + DataSet* _tmp1_; + GeeCollection* _tmp2_; + gboolean _tmp3_; + DataSet* _tmp4_; + gint _tmp5_; + gint _tmp6_; #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" @@ -6183,7 +6205,7 @@ 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 6186 "ViewCollection.c" +#line 6208 "ViewCollection.c" } #line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->visible; @@ -6197,7 +6219,7 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle result = FALSE; #line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6200 "ViewCollection.c" +#line 6222 "ViewCollection.c" } #line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = self->priv->visible; @@ -6211,36 +6233,36 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle _data_set_unref0 (self->priv->visible); #line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->visible = NULL; -#line 6214 "ViewCollection.c" +#line 6236 "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 6220 "ViewCollection.c" +#line 6242 "ViewCollection.c" } static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) { GeeArrayList* unselected = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; gint count = 0; - GeeList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - DataSet* _tmp22_ = NULL; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + DataSet* _tmp22_; gboolean removed = FALSE; - DataSet* _tmp24_ = NULL; - GeeList* _tmp25_ = NULL; - gboolean _tmp26_ = FALSE; - gboolean _tmp27_ = FALSE; - GeeArrayList* _tmp28_ = NULL; - GeeArrayList* _tmp29_ = NULL; - gint _tmp30_ = 0; - gint _tmp31_ = 0; - GeeList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + DataSet* _tmp24_; + GeeList* _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; + GeeArrayList* _tmp28_; + GeeArrayList* _tmp29_; + gint _tmp30_; + gint _tmp31_; + GeeList* _tmp33_; + gint _tmp34_; + gint _tmp35_; #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" @@ -6257,39 +6279,39 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp3_ = _tmp2_; #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" count = _tmp3_; -#line 6260 "ViewCollection.c" +#line 6282 "ViewCollection.c" { gint ctr = 0; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 6265 "ViewCollection.c" +#line 6287 "ViewCollection.c" { gboolean _tmp4_ = FALSE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = TRUE; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6272 "ViewCollection.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 6294 "ViewCollection.c" + gint _tmp6_; + gint _tmp7_; DataView* view = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - DataView* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - DataView* _tmp21_ = NULL; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + DataView* _tmp11_; + gboolean _tmp12_; + DataView* _tmp13_; + gboolean _tmp14_; + DataView* _tmp21_; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!_tmp4_) { -#line 6286 "ViewCollection.c" - gint _tmp5_ = 0; +#line 6308 "ViewCollection.c" + gint _tmp5_; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = ctr; #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = _tmp5_ + 1; -#line 6292 "ViewCollection.c" +#line 6314 "ViewCollection.c" } #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = FALSE; @@ -6301,7 +6323,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) if (!(_tmp6_ < _tmp7_)) { #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6304 "ViewCollection.c" +#line 6326 "ViewCollection.c" } #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = to_hide; @@ -6323,10 +6345,10 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp14_ = data_view_is_selected (_tmp13_); #line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp14_) { -#line 6326 "ViewCollection.c" - DataView* _tmp15_ = NULL; - GeeArrayList* _tmp16_ = NULL; - DataView* _tmp17_ = NULL; +#line 6348 "ViewCollection.c" + DataView* _tmp15_; + GeeArrayList* _tmp16_; + DataView* _tmp17_; #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp15_ = view; #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6337,11 +6359,11 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp17_ = 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 6340 "ViewCollection.c" +#line 6362 "ViewCollection.c" } else { - DataSet* _tmp18_ = NULL; - DataView* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + DataSet* _tmp18_; + DataView* _tmp19_; + gboolean _tmp20_; #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp18_ = self->priv->selected; #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6350,7 +6372,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp20_ = data_set_contains (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject)); #line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (!_tmp20_, "!selected.contains(view)"); -#line 6353 "ViewCollection.c" +#line 6375 "ViewCollection.c" } #line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp21_ = view; @@ -6358,7 +6380,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) data_view_internal_set_visible (_tmp21_, FALSE); #line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 6361 "ViewCollection.c" +#line 6383 "ViewCollection.c" } } } @@ -6366,15 +6388,15 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp22_ = self->priv->visible; #line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp22_ == NULL) { -#line 6369 "ViewCollection.c" - DataSet* _tmp23_ = NULL; +#line 6391 "ViewCollection.c" + DataSet* _tmp23_; #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)); #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 6377 "ViewCollection.c" +#line 6399 "ViewCollection.c" } #line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp24_ = self->priv->visible; @@ -6400,13 +6422,13 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp31_ = _tmp30_; #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp31_ > 0) { -#line 6403 "ViewCollection.c" - GeeArrayList* _tmp32_ = NULL; +#line 6425 "ViewCollection.c" + GeeArrayList* _tmp32_; #line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp32_ = 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 6409 "ViewCollection.c" +#line 6431 "ViewCollection.c" } #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp33_ = to_hide; @@ -6416,9 +6438,9 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp35_ = _tmp34_; #line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp35_ > 0) { -#line 6419 "ViewCollection.c" - GeeList* _tmp36_ = NULL; - GeeList* _tmp37_ = NULL; +#line 6441 "ViewCollection.c" + GeeList* _tmp36_; + GeeList* _tmp37_; #line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp36_ = to_hide; #line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6427,29 +6449,29 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) _tmp37_ = to_hide; #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 6430 "ViewCollection.c" +#line 6452 "ViewCollection.c" } #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (unselected); -#line 6434 "ViewCollection.c" +#line 6456 "ViewCollection.c" } static void view_collection_show_items (ViewCollection* self, GeeList* to_show) { GeeArrayList* added_selected = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; gint count = 0; - GeeList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; gboolean added = FALSE; - GeeList* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_ = FALSE; - GeeArrayList* _tmp24_ = NULL; - GeeList* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; + GeeList* _tmp21_; + gboolean _tmp22_; + gboolean _tmp23_; + GeeArrayList* _tmp24_; + GeeList* _tmp25_; + gint _tmp26_; + gint _tmp27_; #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" @@ -6466,39 +6488,39 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) _tmp3_ = _tmp2_; #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" count = _tmp3_; -#line 6469 "ViewCollection.c" +#line 6491 "ViewCollection.c" { gint ctr = 0; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 6474 "ViewCollection.c" +#line 6496 "ViewCollection.c" { gboolean _tmp4_ = FALSE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = TRUE; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6481 "ViewCollection.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 6503 "ViewCollection.c" + gint _tmp6_; + gint _tmp7_; DataView* view = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - DataView* _tmp13_ = NULL; - DataView* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + DataView* _tmp11_; + gboolean _tmp12_; + DataView* _tmp13_; + DataView* _tmp14_; + gboolean _tmp15_; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!_tmp4_) { -#line 6495 "ViewCollection.c" - gint _tmp5_ = 0; +#line 6517 "ViewCollection.c" + gint _tmp5_; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = ctr; #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = _tmp5_ + 1; -#line 6501 "ViewCollection.c" +#line 6523 "ViewCollection.c" } #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = FALSE; @@ -6510,7 +6532,7 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) if (!(_tmp6_ < _tmp7_)) { #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6513 "ViewCollection.c" +#line 6535 "ViewCollection.c" } #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = to_show; @@ -6536,12 +6558,12 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) _tmp15_ = data_view_is_selected (_tmp14_); #line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp15_) { -#line 6539 "ViewCollection.c" - DataSet* _tmp16_ = NULL; - DataView* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - GeeArrayList* _tmp19_ = NULL; - DataView* _tmp20_ = NULL; +#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; #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6556,11 +6578,11 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) _tmp20_ = 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 6559 "ViewCollection.c" +#line 6581 "ViewCollection.c" } #line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 6563 "ViewCollection.c" +#line 6585 "ViewCollection.c" } } } @@ -6586,9 +6608,9 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) _tmp27_ = _tmp26_; #line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp27_ > 0) { -#line 6589 "ViewCollection.c" - GeeList* _tmp28_ = NULL; - GeeList* _tmp29_ = NULL; +#line 6611 "ViewCollection.c" + GeeList* _tmp28_; + GeeList* _tmp29_; #line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp28_ = to_show; #line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6597,20 +6619,20 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) _tmp29_ = to_show; #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 6600 "ViewCollection.c" +#line 6622 "ViewCollection.c" } #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); -#line 6604 "ViewCollection.c" +#line 6626 "ViewCollection.c" } gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source) { gboolean result = FALSE; - DataSource* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + DataSource* _tmp0_; + DataView* _tmp1_; + DataView* _tmp2_; + gboolean _tmp3_; #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" @@ -6629,15 +6651,15 @@ gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* result = _tmp3_; #line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6632 "ViewCollection.c" +#line 6654 "ViewCollection.c" } DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source) { DataView* result = NULL; - GeeHashMap* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + DataSource* _tmp1_; + gpointer _tmp2_; #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" @@ -6652,16 +6674,16 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* result = (DataView*) _tmp2_; #line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6655 "ViewCollection.c" +#line 6677 "ViewCollection.c" } gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self, DataSource* source) { gboolean result = FALSE; - DataSource* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + DataSource* _tmp0_; + DataView* _tmp1_; + DataView* _tmp2_; + gboolean _tmp3_; #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" @@ -6680,18 +6702,18 @@ gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self result = _tmp3_; #line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6683 "ViewCollection.c" +#line 6705 "ViewCollection.c" } DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source) { DataView* result = NULL; DataView* view = NULL; - GeeHashMap* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + DataSource* _tmp1_; + gpointer _tmp2_; gboolean _tmp3_ = FALSE; - DataView* _tmp4_ = NULL; + DataView* _tmp4_; #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" @@ -6708,20 +6730,20 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da _tmp4_ = view; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp4_ != NULL) { -#line 6711 "ViewCollection.c" - DataView* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 6733 "ViewCollection.c" + DataView* _tmp5_; + gboolean _tmp6_; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = view; #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp6_ = view_collection_is_in_filter (self, _tmp5_); #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = !_tmp6_; -#line 6720 "ViewCollection.c" +#line 6742 "ViewCollection.c" } else { #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = FALSE; -#line 6724 "ViewCollection.c" +#line 6746 "ViewCollection.c" } #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp3_) { @@ -6731,25 +6753,25 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da _g_object_unref0 (view); #line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6734 "ViewCollection.c" +#line 6756 "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 6740 "ViewCollection.c" +#line 6762 "ViewCollection.c" } GeeCollection* view_collection_get_sources (ViewCollection* self) { GeeCollection* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeSet* _tmp4_ = NULL; - GeeSet* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; + GeeHashMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; + GeeCollection* _tmp6_; #line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6772,14 +6794,14 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) { result = _tmp6_; #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 6775 "ViewCollection.c" +#line 6797 "ViewCollection.c" } gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { gboolean result = FALSE; - GType _tmp0_ = 0UL; - gboolean _tmp1_ = 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" @@ -6788,15 +6810,15 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { _tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE); #line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); -#line 6791 "ViewCollection.c" +#line 6813 "ViewCollection.c" { GeeIterator* _source_it = NULL; - GeeHashMap* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeSet* _tmp4_ = NULL; - GeeSet* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + GeeHashMap* _tmp2_; + GeeSet* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; + GeeIterator* _tmp6_; + GeeIterator* _tmp7_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->source_map; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6815,16 +6837,16 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { _source_it = _tmp7_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6818 "ViewCollection.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 6840 "ViewCollection.c" + GeeIterator* _tmp8_; + gboolean _tmp9_; DataSource* source = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - DataSource* _tmp12_ = NULL; - GType _tmp13_ = 0UL; - GType _tmp14_ = 0UL; - gboolean _tmp15_ = FALSE; + 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; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6833,7 +6855,7 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { if (!_tmp9_) { #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6836 "ViewCollection.c" +#line 6858 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp10_ = _source_it; @@ -6859,28 +6881,28 @@ 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 6862 "ViewCollection.c" +#line 6884 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (source); -#line 6866 "ViewCollection.c" +#line 6888 "ViewCollection.c" } #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_source_it); -#line 6870 "ViewCollection.c" +#line 6892 "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 6876 "ViewCollection.c" +#line 6898 "ViewCollection.c" } gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) { gint result = 0; - GType _tmp0_ = 0UL; - gboolean _tmp1_ = FALSE; + 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); @@ -6892,13 +6914,13 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) { _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); #line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" count = 0; -#line 6895 "ViewCollection.c" +#line 6917 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #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)); #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6913,19 +6935,19 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) { _object_it = _tmp5_; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 6916 "ViewCollection.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 6938 "ViewCollection.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - DataObject* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - DataSource* _tmp12_ = NULL; - GType _tmp13_ = 0UL; - GType _tmp14_ = 0UL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + 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; #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6934,7 +6956,7 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) { if (!_tmp7_) { #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 6937 "ViewCollection.c" +#line 6959 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = _object_it; @@ -6960,34 +6982,34 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) { _g_object_unref0 (_tmp12_); #line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp16_) { -#line 6963 "ViewCollection.c" - gint _tmp17_ = 0; +#line 6985 "ViewCollection.c" + gint _tmp17_; #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = count; #line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" count = _tmp17_ + 1; -#line 6969 "ViewCollection.c" +#line 6991 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (object); -#line 6973 "ViewCollection.c" +#line 6995 "ViewCollection.c" } #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 6977 "ViewCollection.c" +#line 6999 "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 6983 "ViewCollection.c" +#line 7005 "ViewCollection.c" } GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { GeeList* result = NULL; - GType _tmp0_ = 0UL; - gboolean _tmp1_ = FALSE; + 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); @@ -6999,13 +7021,13 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { _vala_assert (_tmp1_, "t.is_a(typeof(DataSource))"); #line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sources = NULL; -#line 7002 "ViewCollection.c" +#line 7024 "ViewCollection.c" { GeeIterator* _object_it = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #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)); #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7020,19 +7042,19 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { _object_it = _tmp5_; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7023 "ViewCollection.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 7045 "ViewCollection.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; DataSource* source = NULL; - DataObject* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - DataSource* _tmp12_ = NULL; - GType _tmp13_ = 0UL; - GType _tmp14_ = 0UL; - gboolean _tmp15_ = FALSE; + 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; #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7041,7 +7063,7 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { if (!_tmp7_) { #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7044 "ViewCollection.c" +#line 7066 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = _object_it; @@ -7065,23 +7087,23 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); #line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp15_) { -#line 7068 "ViewCollection.c" - GeeList* _tmp16_ = NULL; - GeeList* _tmp18_ = NULL; - DataSource* _tmp19_ = NULL; +#line 7090 "ViewCollection.c" + GeeList* _tmp16_; + GeeList* _tmp18_; + DataSource* _tmp19_; #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp16_ = sources; #line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp16_ == NULL) { -#line 7076 "ViewCollection.c" - GeeArrayList* _tmp17_ = NULL; +#line 7098 "ViewCollection.c" + GeeArrayList* _tmp17_; #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); #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 7084 "ViewCollection.c" +#line 7106 "ViewCollection.c" } #line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp18_ = sources; @@ -7089,33 +7111,33 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { _tmp19_ = 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 7092 "ViewCollection.c" +#line 7114 "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 7098 "ViewCollection.c" +#line 7120 "ViewCollection.c" } #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_object_it); -#line 7102 "ViewCollection.c" +#line 7124 "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 7108 "ViewCollection.c" +#line 7130 "ViewCollection.c" } GeeList* view_collection_get_selected_sources (ViewCollection* self) { GeeList* result = NULL; GeeList* sources = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; gint count = 0; - DataSet* _tmp1_ = NULL; - gint _tmp2_ = 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" @@ -7128,37 +7150,37 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { _tmp2_ = data_set_get_count (_tmp1_); #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" count = _tmp2_; -#line 7131 "ViewCollection.c" +#line 7153 "ViewCollection.c" { gint ctr = 0; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = 0; -#line 7136 "ViewCollection.c" +#line 7158 "ViewCollection.c" { gboolean _tmp3_ = FALSE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = TRUE; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7143 "ViewCollection.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; - GeeList* _tmp7_ = NULL; - DataSet* _tmp8_ = NULL; - gint _tmp9_ = 0; - DataObject* _tmp10_ = NULL; - DataView* _tmp11_ = NULL; - DataSource* _tmp12_ = NULL; - DataSource* _tmp13_ = NULL; +#line 7165 "ViewCollection.c" + gint _tmp5_; + gint _tmp6_; + GeeList* _tmp7_; + DataSet* _tmp8_; + gint _tmp9_; + DataObject* _tmp10_; + DataView* _tmp11_; + DataSource* _tmp12_; + DataSource* _tmp13_; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!_tmp3_) { -#line 7155 "ViewCollection.c" - gint _tmp4_ = 0; +#line 7177 "ViewCollection.c" + gint _tmp4_; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = ctr; #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ctr = _tmp4_ + 1; -#line 7161 "ViewCollection.c" +#line 7183 "ViewCollection.c" } #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = FALSE; @@ -7170,7 +7192,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { if (!(_tmp5_ < _tmp6_)) { #line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7173 "ViewCollection.c" +#line 7195 "ViewCollection.c" } #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = sources; @@ -7192,7 +7214,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { _g_object_unref0 (_tmp13_); #line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp11_); -#line 7195 "ViewCollection.c" +#line 7217 "ViewCollection.c" } } } @@ -7200,18 +7222,18 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { result = sources; #line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7203 "ViewCollection.c" +#line 7225 "ViewCollection.c" } DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index) { DataSource* result = NULL; DataObject* object = NULL; - DataSet* _tmp0_ = NULL; - gint _tmp1_ = 0; - DataObject* _tmp2_ = NULL; + DataSet* _tmp0_; + gint _tmp1_; + DataObject* _tmp2_; DataSource* _tmp3_ = NULL; - DataObject* _tmp4_ = NULL; + DataObject* _tmp4_; #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" @@ -7226,9 +7248,9 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i _tmp4_ = object; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp4_ != NULL) { -#line 7229 "ViewCollection.c" - DataObject* _tmp5_ = NULL; - DataSource* _tmp6_ = NULL; +#line 7251 "ViewCollection.c" + DataObject* _tmp5_; + DataSource* _tmp6_; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = object; #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7237,13 +7259,13 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i _g_object_unref0 (_tmp3_); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = _tmp6_; -#line 7240 "ViewCollection.c" +#line 7262 "ViewCollection.c" } else { #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp3_); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = NULL; -#line 7246 "ViewCollection.c" +#line 7268 "ViewCollection.c" } #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp3_; @@ -7251,7 +7273,7 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i _g_object_unref0 (object); #line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7254 "ViewCollection.c" +#line 7276 "ViewCollection.c" } @@ -7262,14 +7284,14 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sources = NULL; -#line 7265 "ViewCollection.c" +#line 7287 "ViewCollection.c" { GeeList* _view_list = NULL; - GeeList* _tmp0_ = NULL; + GeeList* _tmp0_; gint _view_size = 0; - GeeList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; gint _view_index = 0; #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = view_collection_get_selected (self); @@ -7287,21 +7309,21 @@ 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 7290 "ViewCollection.c" - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; +#line 7312 "ViewCollection.c" + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; DataView* view = NULL; - GeeList* _tmp7_ = NULL; - gint _tmp8_ = 0; - gpointer _tmp9_ = NULL; + GeeList* _tmp7_; + gint _tmp8_; + gpointer _tmp9_; DataSource* source = NULL; - DataView* _tmp10_ = NULL; - DataSource* _tmp11_ = NULL; - DataSource* _tmp12_ = NULL; - GType _tmp13_ = 0UL; - GType _tmp14_ = 0UL; - gboolean _tmp15_ = FALSE; + 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" @@ -7314,7 +7336,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 7317 "ViewCollection.c" +#line 7339 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = _view_list; @@ -7340,23 +7362,23 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy _tmp15_ = g_type_is_a (_tmp13_, _tmp14_); #line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp15_) { -#line 7343 "ViewCollection.c" - GeeList* _tmp16_ = NULL; - GeeList* _tmp18_ = NULL; - DataSource* _tmp19_ = NULL; +#line 7365 "ViewCollection.c" + GeeList* _tmp16_; + GeeList* _tmp18_; + DataSource* _tmp19_; #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp16_ = sources; #line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp16_ == NULL) { -#line 7351 "ViewCollection.c" - GeeArrayList* _tmp17_ = NULL; +#line 7373 "ViewCollection.c" + GeeArrayList* _tmp17_; #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); #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 7359 "ViewCollection.c" +#line 7381 "ViewCollection.c" } #line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp18_ = sources; @@ -7364,33 +7386,33 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy _tmp19_ = 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 7367 "ViewCollection.c" +#line 7389 "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 7373 "ViewCollection.c" +#line 7395 "ViewCollection.c" } #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_list); -#line 7377 "ViewCollection.c" +#line 7399 "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 7383 "ViewCollection.c" +#line 7405 "ViewCollection.c" } gint view_collection_index_of_source (ViewCollection* self, DataSource* source) { gint result = 0; DataView* view = NULL; - DataSource* _tmp0_ = NULL; - DataView* _tmp1_ = NULL; + DataSource* _tmp0_; + DataView* _tmp1_; gint _tmp2_ = 0; - DataView* _tmp3_ = NULL; + DataView* _tmp3_; #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" @@ -7405,20 +7427,20 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source) _tmp3_ = view; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp3_ != NULL) { -#line 7408 "ViewCollection.c" - DataView* _tmp4_ = NULL; - gint _tmp5_ = 0; +#line 7430 "ViewCollection.c" + DataView* _tmp4_; + gint _tmp5_; #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = view; #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)); #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _tmp5_; -#line 7417 "ViewCollection.c" +#line 7439 "ViewCollection.c" } else { #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = -1; -#line 7421 "ViewCollection.c" +#line 7443 "ViewCollection.c" } #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" result = _tmp2_; @@ -7426,12 +7448,12 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source) _g_object_unref0 (view); #line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7429 "ViewCollection.c" +#line 7451 "ViewCollection.c" } void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #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" @@ -7440,11 +7462,11 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie _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 7443 "ViewCollection.c" - DataView* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; +#line 7465 "ViewCollection.c" + DataView* _tmp1_; + DataView* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; #line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = view; #line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7459,24 +7481,24 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie view_collection_notify_views_altered (self, _tmp4_); #line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp4_); -#line 7462 "ViewCollection.c" +#line 7484 "ViewCollection.c" } else { - GeeHashSet* _tmp5_ = NULL; - GeeHashSet* _tmp7_ = NULL; - DataView* _tmp8_ = NULL; + GeeHashSet* _tmp5_; + GeeHashSet* _tmp7_; + DataView* _tmp8_; #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = self->priv->frozen_views_altered; #line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp5_ == NULL) { -#line 7471 "ViewCollection.c" - GeeHashSet* _tmp6_ = NULL; +#line 7493 "ViewCollection.c" + GeeHashSet* _tmp6_; #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); #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 7479 "ViewCollection.c" +#line 7501 "ViewCollection.c" } #line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = self->priv->frozen_views_altered; @@ -7484,13 +7506,13 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie _tmp8_ = view; #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 7487 "ViewCollection.c" +#line 7509 "ViewCollection.c" } } void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #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" @@ -7499,11 +7521,11 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat _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 7502 "ViewCollection.c" - DataView* _tmp1_ = NULL; - DataView* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; +#line 7524 "ViewCollection.c" + DataView* _tmp1_; + DataView* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; #line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = view; #line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7518,24 +7540,24 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat view_collection_notify_geometries_altered (self, _tmp4_); #line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_tmp4_); -#line 7521 "ViewCollection.c" +#line 7543 "ViewCollection.c" } else { - GeeHashSet* _tmp5_ = NULL; - GeeHashSet* _tmp7_ = NULL; - DataView* _tmp8_ = NULL; + GeeHashSet* _tmp5_; + GeeHashSet* _tmp7_; + DataView* _tmp8_; #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = self->priv->frozen_geometries_altered; #line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp5_ == NULL) { -#line 7530 "ViewCollection.c" - GeeHashSet* _tmp6_ = NULL; +#line 7552 "ViewCollection.c" + GeeHashSet* _tmp6_; #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); #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 7538 "ViewCollection.c" +#line 7560 "ViewCollection.c" } #line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp7_ = self->priv->frozen_geometries_altered; @@ -7543,27 +7565,27 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat _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 7546 "ViewCollection.c" +#line 7568 "ViewCollection.c" } } static void view_collection_real_notify_thawed (DataCollection* base) { ViewCollection * self; - GeeHashSet* _tmp0_ = NULL; - GeeHashSet* _tmp9_ = NULL; + GeeHashSet* _tmp0_; + GeeHashSet* _tmp9_; #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 7561 "ViewCollection.c" - GeeHashSet* _tmp8_ = NULL; +#line 7583 "ViewCollection.c" + GeeHashSet* _tmp8_; { GeeIterator* _view_it = NULL; - GeeHashSet* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeHashSet* _tmp1_; + GeeIterator* _tmp2_; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = self->priv->frozen_views_altered; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7572,13 +7594,13 @@ 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 7575 "ViewCollection.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 7597 "ViewCollection.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataView* view = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DataView* _tmp7_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataView* _tmp7_; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = _view_it; #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7587,7 +7609,7 @@ static void view_collection_real_notify_thawed (DataCollection* base) { if (!_tmp4_) { #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7590 "ViewCollection.c" +#line 7612 "ViewCollection.c" } #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _view_it; @@ -7601,11 +7623,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) { view_collection_notify_item_view_altered (self, _tmp7_); #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7604 "ViewCollection.c" +#line 7626 "ViewCollection.c" } #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 7608 "ViewCollection.c" +#line 7630 "ViewCollection.c" } #line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp8_ = self->priv->frozen_views_altered; @@ -7615,18 +7637,18 @@ static void view_collection_real_notify_thawed (DataCollection* base) { _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 7618 "ViewCollection.c" +#line 7640 "ViewCollection.c" } #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp9_ = self->priv->frozen_geometries_altered; #line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (_tmp9_ != NULL) { -#line 7624 "ViewCollection.c" - GeeHashSet* _tmp17_ = NULL; +#line 7646 "ViewCollection.c" + GeeHashSet* _tmp17_; { GeeIterator* _view_it = NULL; - GeeHashSet* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + GeeHashSet* _tmp10_; + GeeIterator* _tmp11_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp10_ = self->priv->frozen_geometries_altered; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7635,13 +7657,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) { _view_it = _tmp11_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" while (TRUE) { -#line 7638 "ViewCollection.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 7660 "ViewCollection.c" + GeeIterator* _tmp12_; + gboolean _tmp13_; DataView* view = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; - DataView* _tmp16_ = NULL; + GeeIterator* _tmp14_; + gpointer _tmp15_; + DataView* _tmp16_; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp12_ = _view_it; #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7650,7 +7672,7 @@ static void view_collection_real_notify_thawed (DataCollection* base) { if (!_tmp13_) { #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" break; -#line 7653 "ViewCollection.c" +#line 7675 "ViewCollection.c" } #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp14_ = _view_it; @@ -7664,11 +7686,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) { view_collection_notify_item_geometry_altered (self, _tmp16_); #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (view); -#line 7667 "ViewCollection.c" +#line 7689 "ViewCollection.c" } #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (_view_it); -#line 7671 "ViewCollection.c" +#line 7693 "ViewCollection.c" } #line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp17_ = self->priv->frozen_geometries_altered; @@ -7678,18 +7700,18 @@ static void view_collection_real_notify_thawed (DataCollection* base) { _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 7681 "ViewCollection.c" +#line 7703 "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 7685 "ViewCollection.c" +#line 7707 "ViewCollection.c" } gboolean view_collection_are_items_filtered_out (ViewCollection* self) { gboolean result = FALSE; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + 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" @@ -7700,28 +7722,28 @@ gboolean view_collection_are_items_filtered_out (ViewCollection* self) { result = _tmp0_ != _tmp1_; #line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return result; -#line 7703 "ViewCollection.c" +#line 7725 "ViewCollection.c" } 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 7710 "ViewCollection.c" +#line 7732 "ViewCollection.c" } 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 7717 "ViewCollection.c" +#line 7739 "ViewCollection.c" } 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 7724 "ViewCollection.c" +#line 7746 "ViewCollection.c" } @@ -7732,56 +7754,56 @@ static void view_collection_real_selection_group_altered (ViewCollection* self) 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 7735 "ViewCollection.c" +#line 7757 "ViewCollection.c" } 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 7742 "ViewCollection.c" +#line 7764 "ViewCollection.c" } 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 7749 "ViewCollection.c" +#line 7771 "ViewCollection.c" } 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 7756 "ViewCollection.c" +#line 7778 "ViewCollection.c" } 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 7763 "ViewCollection.c" +#line 7785 "ViewCollection.c" } 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 7770 "ViewCollection.c" +#line 7792 "ViewCollection.c" } 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 7777 "ViewCollection.c" +#line 7799 "ViewCollection.c" } 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 7784 "ViewCollection.c" +#line 7806 "ViewCollection.c" } @@ -7800,26 +7822,26 @@ 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 7803 "ViewCollection.c" +#line 7825 "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 7809 "ViewCollection.c" +#line 7831 "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 7815 "ViewCollection.c" +#line 7837 "ViewCollection.c" } 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 7822 "ViewCollection.c" +#line 7844 "ViewCollection.c" } @@ -7829,21 +7851,21 @@ ViewCollectionMonitor* view_collection_monitor_construct (GType object_type) { self = (ViewCollectionMonitor*) g_type_create_instance (object_type); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 7832 "ViewCollection.c" +#line 7854 "ViewCollection.c" } 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 7839 "ViewCollection.c" +#line 7861 "ViewCollection.c" } 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 7846 "ViewCollection.c" +#line 7868 "ViewCollection.c" } @@ -7852,7 +7874,7 @@ static void view_collection_value_monitor_free_value (GValue* value) { 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 7855 "ViewCollection.c" +#line 7877 "ViewCollection.c" } } @@ -7862,11 +7884,11 @@ static void view_collection_value_monitor_copy_value (const GValue* src_value, G 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 7865 "ViewCollection.c" +#line 7887 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 7869 "ViewCollection.c" +#line 7891 "ViewCollection.c" } } @@ -7874,66 +7896,66 @@ static void view_collection_value_monitor_copy_value (const GValue* src_value, G 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 7877 "ViewCollection.c" +#line 7899 "ViewCollection.c" } 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 7884 "ViewCollection.c" - ViewCollectionMonitor* object; +#line 7906 "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 7891 "ViewCollection.c" +#line 7913 "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 7895 "ViewCollection.c" +#line 7917 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_collection_monitor_ref (object); -#line 7899 "ViewCollection.c" +#line 7921 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 7903 "ViewCollection.c" +#line 7925 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 7907 "ViewCollection.c" +#line 7929 "ViewCollection.c" } static gchar* view_collection_value_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - ViewCollectionMonitor** object_p; + 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 7918 "ViewCollection.c" +#line 7940 "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 7924 "ViewCollection.c" +#line 7946 "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 7928 "ViewCollection.c" +#line 7950 "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 7932 "ViewCollection.c" +#line 7954 "ViewCollection.c" } #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 7936 "ViewCollection.c" +#line 7958 "ViewCollection.c" } @@ -7947,7 +7969,7 @@ 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 7950 "ViewCollection.c" +#line 7972 "ViewCollection.c" } @@ -7956,12 +7978,12 @@ gpointer view_collection_value_get_monitor (const GValue* value) { 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 7959 "ViewCollection.c" +#line 7981 "ViewCollection.c" } void view_collection_value_set_monitor (GValue* value, gpointer v_object) { - ViewCollectionMonitor* old; + 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)); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7976,23 +7998,23 @@ 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 7979 "ViewCollection.c" +#line 8001 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 7983 "ViewCollection.c" +#line 8005 "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 7989 "ViewCollection.c" +#line 8011 "ViewCollection.c" } } void view_collection_value_take_monitor (GValue* value, gpointer v_object) { - ViewCollectionMonitor* old; + 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)); #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8005,17 +8027,17 @@ 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 8008 "ViewCollection.c" +#line 8030 "ViewCollection.c" } else { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8012 "ViewCollection.c" +#line 8034 "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 8018 "ViewCollection.c" +#line 8040 "ViewCollection.c" } } @@ -8025,24 +8047,24 @@ static void view_collection_monitor_class_init (ViewCollectionMonitorClass * kla 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 8028 "ViewCollection.c" +#line 8050 "ViewCollection.c" } static void view_collection_monitor_instance_init (ViewCollectionMonitor * self) { #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 8035 "ViewCollection.c" +#line 8057 "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 8045 "ViewCollection.c" +#line 8067 "ViewCollection.c" } @@ -8061,18 +8083,18 @@ GType view_collection_monitor_get_type (void) { gpointer view_collection_monitor_ref (gpointer instance) { - ViewCollectionMonitor* self; + 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 8070 "ViewCollection.c" +#line 8092 "ViewCollection.c" } void view_collection_monitor_unref (gpointer instance) { - ViewCollectionMonitor* self; + ViewCollectionMonitor * self; self = instance; #line 22 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -8080,7 +8102,7 @@ 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 8083 "ViewCollection.c" +#line 8105 "ViewCollection.c" } } @@ -8088,54 +8110,54 @@ void view_collection_monitor_unref (gpointer instance) { 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 8091 "ViewCollection.c" +#line 8113 "ViewCollection.c" } 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 8098 "ViewCollection.c" +#line 8120 "ViewCollection.c" } 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 8105 "ViewCollection.c" +#line 8127 "ViewCollection.c" } 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 8112 "ViewCollection.c" +#line 8134 "ViewCollection.c" } static gpointer _alteration_ref0 (gpointer self) { #line 36 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self ? alteration_ref (self) : NULL; -#line 8119 "ViewCollection.c" +#line 8141 "ViewCollection.c" } static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType object_type, ViewCollection* owner, SourceCollection* sources, ViewManager* manager, Alteration* prereq) { ViewCollectionMonitorImpl* self = NULL; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - SourceCollection* _tmp2_ = NULL; - SourceCollection* _tmp3_ = NULL; - ViewManager* _tmp4_ = NULL; - ViewManager* _tmp5_ = NULL; - Alteration* _tmp6_ = NULL; - Alteration* _tmp7_ = NULL; - SourceCollection* _tmp8_ = NULL; - ViewCollection* _tmp9_ = NULL; - SourceCollection* _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - SourceCollection* _tmp12_ = NULL; - ViewCollection* _tmp13_ = 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_; #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" @@ -8198,14 +8220,14 @@ static ViewCollectionMonitorImpl* view_collection_monitor_impl_construct (GType 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_); #line 31 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8201 "ViewCollection.c" +#line 8223 "ViewCollection.c" } 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 8208 "ViewCollection.c" +#line 8230 "ViewCollection.c" } @@ -8214,7 +8236,7 @@ static void view_collection_monitor_impl_class_init (ViewCollectionMonitorImplCl 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 8217 "ViewCollection.c" +#line 8239 "ViewCollection.c" } @@ -8222,17 +8244,17 @@ static void view_collection_monitor_impl_instance_init (ViewCollectionMonitorImp } -static void view_collection_monitor_impl_finalize (ViewCollectionMonitor* obj) { +static void view_collection_monitor_impl_finalize (ViewCollectionMonitor * obj) { ViewCollectionMonitorImpl * self; - SourceCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - guint _tmp2_ = 0U; - SourceCollection* _tmp3_ = NULL; - ViewCollection* _tmp4_ = NULL; - guint _tmp5_ = 0U; - SourceCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - guint _tmp8_ = 0U; + SourceCollection* _tmp0_; + ViewCollection* _tmp1_; + guint _tmp2_; + SourceCollection* _tmp3_; + ViewCollection* _tmp4_; + guint _tmp5_; + SourceCollection* _tmp6_; + ViewCollection* _tmp7_; + guint _tmp8_; #line 25 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIEW_COLLECTION_TYPE_MONITOR_IMPL, ViewCollectionMonitorImpl); #line 44 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8269,7 +8291,7 @@ 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 8272 "ViewCollection.c" +#line 8294 "ViewCollection.c" } @@ -8291,14 +8313,14 @@ static ViewCollectionToggleLists* view_collection_toggle_lists_construct (GType self = (ViewCollectionToggleLists*) g_object_new (object_type, NULL); #line 50 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8294 "ViewCollection.c" +#line 8316 "ViewCollection.c" } 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 8301 "ViewCollection.c" +#line 8323 "ViewCollection.c" } @@ -8307,13 +8329,13 @@ static void view_collection_toggle_lists_class_init (ViewCollectionToggleListsCl 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 8310 "ViewCollection.c" +#line 8332 "ViewCollection.c" } static void view_collection_toggle_lists_instance_init (ViewCollectionToggleLists * self) { - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp1_; #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8322,11 +8344,11 @@ 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 8325 "ViewCollection.c" +#line 8347 "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); @@ -8336,7 +8358,7 @@ 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 8339 "ViewCollection.c" +#line 8361 "ViewCollection.c" } @@ -8360,69 +8382,69 @@ static void view_collection_class_init (ViewCollectionClass * klass) { #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_class_add_private (klass, sizeof (ViewCollectionPrivate)); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_selected_unselected = (void (*)(ViewCollection*, GeeCollection*, GeeCollection*)) view_collection_real_notify_items_selected_unselected; + ((ViewCollectionClass *) klass)->notify_items_selected_unselected = (void (*) (ViewCollection *, GeeCollection*, GeeCollection*)) view_collection_real_notify_items_selected_unselected; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_selection_group_altered = (void (*)(ViewCollection*)) view_collection_real_notify_selection_group_altered; + ((ViewCollectionClass *) klass)->notify_selection_group_altered = (void (*) (ViewCollection *)) view_collection_real_notify_selection_group_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_item_view_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_view_altered; + ((ViewCollectionClass *) klass)->notify_item_view_altered = (void (*) (ViewCollection *, DataView*)) view_collection_real_notify_item_view_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_views_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_views_altered; + ((ViewCollectionClass *) klass)->notify_views_altered = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_views_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_item_geometry_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_geometry_altered; + ((ViewCollectionClass *) klass)->notify_item_geometry_altered = (void (*) (ViewCollection *, DataView*)) view_collection_real_notify_item_geometry_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_geometries_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_geometries_altered; + ((ViewCollectionClass *) klass)->notify_geometries_altered = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_geometries_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_shown = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_shown; + ((ViewCollectionClass *) klass)->notify_items_shown = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_shown; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_hidden = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_hidden; + ((ViewCollectionClass *) klass)->notify_items_hidden = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_hidden; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_visibility_changed = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_visibility_changed; + ((ViewCollectionClass *) klass)->notify_items_visibility_changed = (void (*) (ViewCollection *, GeeCollection*)) view_collection_real_notify_items_visibility_changed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_view_filter_installed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_installed; + ((ViewCollectionClass *) klass)->notify_view_filter_installed = (void (*) (ViewCollection *, ViewFilter*)) view_collection_real_notify_view_filter_installed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_view_filter_removed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_removed; + ((ViewCollectionClass *) klass)->notify_view_filter_removed = (void (*) (ViewCollection *, ViewFilter*)) view_collection_real_notify_view_filter_removed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) view_collection_real_clear; + ((DataCollectionClass *) klass)->clear = (void (*) (DataCollection *)) view_collection_real_clear; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) view_collection_real_close; + ((DataCollectionClass *) klass)->close = (void (*) (DataCollection *)) view_collection_real_close; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_valid_type; + ((DataCollectionClass *) klass)->valid_type = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_valid_type; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_add; + ((DataCollectionClass *) klass)->add = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_add; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) view_collection_real_add_many; + ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*) (DataCollection *, GeeCollection*, ProgressMonitor, void*)) view_collection_real_add_many; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_added; + ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) view_collection_real_notify_items_added; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_removed; + ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) view_collection_real_notify_items_removed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) view_collection_real_items_altered; + ((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) view_collection_real_items_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) view_collection_real_set_comparator; + ((DataCollectionClass *) klass)->set_comparator = (void (*) (DataCollection *, Comparator, void*, ComparatorPredicate, void*)) view_collection_real_set_comparator; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) view_collection_real_reset_comparator; + ((DataCollectionClass *) klass)->reset_comparator = (void (*) (DataCollection *)) view_collection_real_reset_comparator; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) view_collection_real_get_all; + ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*) (DataCollection *)) view_collection_real_get_all; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) view_collection_real_get_count; + ((DataCollectionClass *) klass)->get_count = (gint (*) (DataCollection *)) view_collection_real_get_count; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) view_collection_real_get_at; + ((DataCollectionClass *) klass)->get_at = (DataObject* (*) (DataCollection *, gint)) view_collection_real_get_at; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) view_collection_real_index_of; + ((DataCollectionClass *) klass)->index_of = (gint (*) (DataCollection *, DataObject*)) view_collection_real_index_of; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_contains; + ((DataCollectionClass *) klass)->contains = (gboolean (*) (DataCollection *, DataObject*)) view_collection_real_contains; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_first = (DataView* (*)(ViewCollection*)) view_collection_real_get_first; + ((ViewCollectionClass *) klass)->get_first = (DataView* (*) (ViewCollection *)) view_collection_real_get_first; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_first_unrejected = (DataView* (*)(ViewCollection*)) view_collection_real_get_first_unrejected; + ((ViewCollectionClass *) klass)->get_first_unrejected = (DataView* (*) (ViewCollection *)) view_collection_real_get_first_unrejected; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_last = (DataView* (*)(ViewCollection*)) view_collection_real_get_last; + ((ViewCollectionClass *) klass)->get_last = (DataView* (*) (ViewCollection *)) view_collection_real_get_last; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_next = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_next; + ((ViewCollectionClass *) klass)->get_next = (DataView* (*) (ViewCollection *, DataView*)) view_collection_real_get_next; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_previous = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_previous; + ((ViewCollectionClass *) klass)->get_previous = (DataView* (*) (ViewCollection *, DataView*)) view_collection_real_get_previous; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) view_collection_real_notify_thawed; + ((DataCollectionClass *) klass)->notify_thawed = (void (*) (DataCollection *)) view_collection_real_notify_thawed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewCollectionClass *) klass)->items_selected = view_collection_real_items_selected; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8450,40 +8472,40 @@ static void view_collection_class_init (ViewCollectionClass * klass) { #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewCollectionClass *) klass)->view_filter_removed = view_collection_real_view_filter_removed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("items_selected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_selected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); + view_collection_signals[VIEW_COLLECTION_ITEMS_SELECTED_SIGNAL] = g_signal_new ("items-selected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_selected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("items_unselected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_unselected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); + view_collection_signals[VIEW_COLLECTION_ITEMS_UNSELECTED_SIGNAL] = g_signal_new ("items-unselected", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_unselected), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("items_state_changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_state_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); + view_collection_signals[VIEW_COLLECTION_ITEMS_STATE_CHANGED_SIGNAL] = g_signal_new ("items-state-changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_state_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_ITERABLE); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("selection_group_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, selection_group_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + view_collection_signals[VIEW_COLLECTION_SELECTION_GROUP_ALTERED_SIGNAL] = g_signal_new ("selection-group-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, selection_group_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("items_shown", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_shown), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + view_collection_signals[VIEW_COLLECTION_ITEMS_SHOWN_SIGNAL] = g_signal_new ("items-shown", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_shown), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("items_hidden", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_hidden), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + view_collection_signals[VIEW_COLLECTION_ITEMS_HIDDEN_SIGNAL] = g_signal_new ("items-hidden", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_hidden), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("items_visibility_changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + view_collection_signals[VIEW_COLLECTION_ITEMS_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("items-visibility-changed", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, items_visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("item_view_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_view_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW); + view_collection_signals[VIEW_COLLECTION_ITEM_VIEW_ALTERED_SIGNAL] = g_signal_new ("item-view-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_view_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("item_geometry_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW); + view_collection_signals[VIEW_COLLECTION_ITEM_GEOMETRY_ALTERED_SIGNAL] = g_signal_new ("item-geometry-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, item_geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_VIEW); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("views_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, views_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + view_collection_signals[VIEW_COLLECTION_VIEWS_ALTERED_SIGNAL] = g_signal_new ("views-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, views_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - g_signal_new ("geometries_altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, geometries_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + view_collection_signals[VIEW_COLLECTION_GEOMETRIES_ALTERED_SIGNAL] = g_signal_new ("geometries-altered", TYPE_VIEW_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewCollectionClass, geometries_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - 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); + 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" - 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 8478 "ViewCollection.c" + 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" } static void view_collection_instance_init (ViewCollection * self) { - GeeHashMultiMap* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; - DataSet* _tmp2_ = NULL; - GeeHashMap* _tmp3_ = NULL; + GeeHashMultiMap* _tmp0_; + GeeHashSet* _tmp1_; + DataSet* _tmp2_; + GeeHashMap* _tmp3_; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv = VIEW_COLLECTION_GET_PRIVATE (self); #line 59 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8494,8 +8516,12 @@ static void view_collection_instance_init (ViewCollection * self) { self->priv->mirroring = NULL; #line 62 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->mirroring_ctor = NULL; +#line 62 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" + self->priv->mirroring_ctor_target = self; #line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->should_mirror = NULL; +#line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" + self->priv->should_mirror_target = self; #line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp1_ = gee_hash_set_new (TYPE_VIEW_FILTER, (GBoxedCopyFunc) view_filter_ref, (GDestroyNotify) view_filter_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8514,11 +8540,11 @@ 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 8517 "ViewCollection.c" +#line 8543 "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); @@ -8540,7 +8566,7 @@ 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 8543 "ViewCollection.c" +#line 8569 "ViewCollection.c" } @@ -8564,7 +8590,7 @@ 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 8567 "ViewCollection.c" +#line 8593 "ViewCollection.c" } @@ -8573,7 +8599,7 @@ gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) { 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 8576 "ViewCollection.c" +#line 8602 "ViewCollection.c" } @@ -8582,7 +8608,7 @@ static DataView* view_manager_real_create_view (ViewManager* self, DataSource* s 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 8585 "ViewCollection.c" +#line 8611 "ViewCollection.c" } @@ -8591,7 +8617,7 @@ DataView* view_manager_create_view (ViewManager* self, DataSource* source) { 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 8594 "ViewCollection.c" +#line 8620 "ViewCollection.c" } @@ -8601,14 +8627,14 @@ ViewManager* view_manager_construct (GType object_type) { self = (ViewManager*) g_type_create_instance (object_type); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8604 "ViewCollection.c" +#line 8630 "ViewCollection.c" } 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 8611 "ViewCollection.c" +#line 8637 "ViewCollection.c" } @@ -8617,7 +8643,7 @@ static void value_view_manager_free_value (GValue* value) { 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 8620 "ViewCollection.c" +#line 8646 "ViewCollection.c" } } @@ -8627,11 +8653,11 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest 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 8630 "ViewCollection.c" +#line 8656 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 8634 "ViewCollection.c" +#line 8660 "ViewCollection.c" } } @@ -8639,66 +8665,66 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest 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 8642 "ViewCollection.c" +#line 8668 "ViewCollection.c" } 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 8649 "ViewCollection.c" - ViewManager* object; +#line 8675 "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 8656 "ViewCollection.c" +#line 8682 "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 8660 "ViewCollection.c" +#line 8686 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_manager_ref (object); -#line 8664 "ViewCollection.c" +#line 8690 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8668 "ViewCollection.c" +#line 8694 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8672 "ViewCollection.c" +#line 8698 "ViewCollection.c" } static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - ViewManager** object_p; + 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 8683 "ViewCollection.c" +#line 8709 "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 8689 "ViewCollection.c" +#line 8715 "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 8693 "ViewCollection.c" +#line 8719 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_manager_ref (value->data[0].v_pointer); -#line 8697 "ViewCollection.c" +#line 8723 "ViewCollection.c" } #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8701 "ViewCollection.c" +#line 8727 "ViewCollection.c" } @@ -8712,7 +8738,7 @@ 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 8715 "ViewCollection.c" +#line 8741 "ViewCollection.c" } @@ -8721,12 +8747,12 @@ gpointer value_get_view_manager (const GValue* value) { 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 8724 "ViewCollection.c" +#line 8750 "ViewCollection.c" } void value_set_view_manager (GValue* value, gpointer v_object) { - ViewManager* old; + 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)); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8741,23 +8767,23 @@ 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 8744 "ViewCollection.c" +#line 8770 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8748 "ViewCollection.c" +#line 8774 "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 8754 "ViewCollection.c" +#line 8780 "ViewCollection.c" } } void value_take_view_manager (GValue* value, gpointer v_object) { - ViewManager* old; + 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)); #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8770,17 +8796,17 @@ 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 8773 "ViewCollection.c" +#line 8799 "ViewCollection.c" } else { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8777 "ViewCollection.c" +#line 8803 "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 8783 "ViewCollection.c" +#line 8809 "ViewCollection.c" } } @@ -8791,27 +8817,27 @@ static void view_manager_class_init (ViewManagerClass * klass) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewManagerClass *) klass)->finalize = view_manager_finalize; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) view_manager_real_include_in_view; + ((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 8797 "ViewCollection.c" + ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) view_manager_real_create_view; +#line 8823 "ViewCollection.c" } static void view_manager_instance_init (ViewManager * self) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 8804 "ViewCollection.c" +#line 8830 "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 8814 "ViewCollection.c" +#line 8840 "ViewCollection.c" } @@ -8830,18 +8856,18 @@ GType view_manager_get_type (void) { gpointer view_manager_ref (gpointer instance) { - ViewManager* self; + 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 8839 "ViewCollection.c" +#line 8865 "ViewCollection.c" } void view_manager_unref (gpointer instance) { - ViewManager* self; + ViewManager * self; self = instance; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -8849,7 +8875,7 @@ 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 8852 "ViewCollection.c" +#line 8878 "ViewCollection.c" } } @@ -8860,7 +8886,7 @@ static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) { 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 8863 "ViewCollection.c" +#line 8889 "ViewCollection.c" } @@ -8869,7 +8895,7 @@ gboolean view_filter_predicate (ViewFilter* self, DataView* view) { 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 8872 "ViewCollection.c" +#line 8898 "ViewCollection.c" } @@ -8879,7 +8905,7 @@ ViewFilter* view_filter_construct (GType object_type) { self = (ViewFilter*) g_type_create_instance (object_type); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8882 "ViewCollection.c" +#line 8908 "ViewCollection.c" } @@ -8890,7 +8916,7 @@ static void view_filter_real_refresh (ViewFilter* self) { 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 8893 "ViewCollection.c" +#line 8919 "ViewCollection.c" } @@ -8899,7 +8925,7 @@ static void value_view_filter_free_value (GValue* value) { 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 8902 "ViewCollection.c" +#line 8928 "ViewCollection.c" } } @@ -8909,11 +8935,11 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_ 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 8912 "ViewCollection.c" +#line 8938 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 8916 "ViewCollection.c" +#line 8942 "ViewCollection.c" } } @@ -8921,66 +8947,66 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_ 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 8924 "ViewCollection.c" +#line 8950 "ViewCollection.c" } 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 8931 "ViewCollection.c" - ViewFilter* object; +#line 8957 "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 8938 "ViewCollection.c" +#line 8964 "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 8942 "ViewCollection.c" +#line 8968 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_filter_ref (object); -#line 8946 "ViewCollection.c" +#line 8972 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8950 "ViewCollection.c" +#line 8976 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8954 "ViewCollection.c" +#line 8980 "ViewCollection.c" } static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - ViewFilter** object_p; + 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 8965 "ViewCollection.c" +#line 8991 "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 8971 "ViewCollection.c" +#line 8997 "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 8975 "ViewCollection.c" +#line 9001 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_filter_ref (value->data[0].v_pointer); -#line 8979 "ViewCollection.c" +#line 9005 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8983 "ViewCollection.c" +#line 9009 "ViewCollection.c" } @@ -8994,7 +9020,7 @@ 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 8997 "ViewCollection.c" +#line 9023 "ViewCollection.c" } @@ -9003,12 +9029,12 @@ gpointer value_get_view_filter (const GValue* value) { 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 9006 "ViewCollection.c" +#line 9032 "ViewCollection.c" } void value_set_view_filter (GValue* value, gpointer v_object) { - ViewFilter* old; + 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)); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -9023,23 +9049,23 @@ 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 9026 "ViewCollection.c" +#line 9052 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9030 "ViewCollection.c" +#line 9056 "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 9036 "ViewCollection.c" +#line 9062 "ViewCollection.c" } } void value_take_view_filter (GValue* value, gpointer v_object) { - ViewFilter* old; + 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)); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -9052,17 +9078,17 @@ 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 9055 "ViewCollection.c" +#line 9081 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9059 "ViewCollection.c" +#line 9085 "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 9065 "ViewCollection.c" +#line 9091 "ViewCollection.c" } } @@ -9073,29 +9099,29 @@ static void view_filter_class_init (ViewFilterClass * klass) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewFilterClass *) klass)->finalize = view_filter_finalize; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) view_filter_real_predicate; + ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) view_filter_real_predicate; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewFilterClass *) klass)->refresh = view_filter_real_refresh; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - 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 9081 "ViewCollection.c" + 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" } static void view_filter_instance_init (ViewFilter * self) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 9088 "ViewCollection.c" +#line 9114 "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 9098 "ViewCollection.c" +#line 9124 "ViewCollection.c" } @@ -9114,18 +9140,18 @@ GType view_filter_get_type (void) { gpointer view_filter_ref (gpointer instance) { - ViewFilter* self; + 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 9123 "ViewCollection.c" +#line 9149 "ViewCollection.c" } void view_filter_unref (gpointer instance) { - ViewFilter* self; + ViewFilter * self; self = instance; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -9133,7 +9159,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 9136 "ViewCollection.c" +#line 9162 "ViewCollection.c" } } diff --git a/src/core/util.c b/src/core/util.c index 0ddab1f..f4143d3 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.34.7, the Vala compiler +/* util.c generated by valac 0.36.6, the Vala compiler * generated from util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -184,8 +184,8 @@ struct _ParamSpecAggregateProgressMonitor { static gpointer singleton_collection_parent_class = NULL; static gpointer singleton_collection_singleton_iterator_parent_class = NULL; -static GeeTraversableIface* singleton_collection_singleton_iterator_gee_traversable_parent_iface = NULL; -static GeeIteratorIface* singleton_collection_singleton_iterator_gee_iterator_parent_iface = NULL; +static GeeTraversableIface * singleton_collection_singleton_iterator_gee_traversable_parent_iface = NULL; +static GeeIteratorIface * singleton_collection_singleton_iterator_gee_iterator_parent_iface = NULL; static gpointer unknown_total_monitor_parent_class = NULL; static gpointer aggregate_progress_monitor_parent_class = NULL; @@ -196,8 +196,8 @@ enum { SINGLETON_COLLECTION_G_TYPE, SINGLETON_COLLECTION_G_DUP_FUNC, SINGLETON_COLLECTION_G_DESTROY_FUNC, - SINGLETON_COLLECTION_READ_ONLY, - SINGLETON_COLLECTION_SIZE + 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); @@ -215,18 +215,18 @@ enum { 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, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID + 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 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 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 singleton_collection_finalize (GObject* obj); +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); GType data_object_get_type (void) G_GNUC_CONST; @@ -253,7 +253,7 @@ enum { 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); +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); @@ -269,15 +269,15 @@ AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, P 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); +static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj); 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 * self = NULL; - gconstpointer _tmp0_ = NULL; - gpointer _tmp1_ = NULL; + gconstpointer _tmp0_; + gpointer _tmp1_; #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" @@ -337,8 +337,8 @@ static void singleton_collection_real_clear (GeeAbstractCollection* base) { static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object) { SingletonCollection * self; gboolean result = FALSE; - gconstpointer _tmp0_ = NULL; - gconstpointer _tmp1_ = NULL; + 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" @@ -356,7 +356,7 @@ static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base) { SingletonCollection * self; GeeIterator* result = NULL; - SingletonCollectionSingletonIterator* _tmp0_ = NULL; + SingletonCollectionSingletonIterator* _tmp0_; #line 87 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 88 "/home/jens/Source/shotwell/src/core/util.vala" @@ -372,8 +372,8 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item) { SingletonCollection * self; gboolean result = FALSE; - gconstpointer _tmp0_ = NULL; - gconstpointer _tmp1_ = NULL; + 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" @@ -417,7 +417,7 @@ static gint singleton_collection_real_get_size (GeeAbstractCollection* base) { gint result; SingletonCollection* self; gint _tmp0_ = 0; - gconstpointer _tmp1_ = NULL; + gconstpointer _tmp1_; #line 102 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 103 "/home/jens/Source/shotwell/src/core/util.vala" @@ -449,8 +449,8 @@ static gpointer _g_object_ref0 (gpointer self) { 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_ = NULL; - SingletonCollection* _tmp1_ = 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" @@ -485,12 +485,12 @@ static SingletonCollectionSingletonIterator* singleton_collection_singleton_iter static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) { SingletonCollectionSingletonIterator * self; gboolean result = FALSE; - GeeForallFunc _tmp0_ = NULL; - void* _tmp0__target = NULL; - SingletonCollection* _tmp1_ = NULL; - gconstpointer _tmp2_ = NULL; - gpointer _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeForallFunc _tmp0_; + void* _tmp0__target; + SingletonCollection* _tmp1_; + gconstpointer _tmp2_; + gpointer _tmp3_; + gboolean _tmp4_; #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" @@ -516,8 +516,8 @@ static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTravers static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base) { SingletonCollectionSingletonIterator * self; gpointer result = NULL; - gconstpointer _tmp0_ = NULL; - gpointer _tmp1_ = NULL; + gconstpointer _tmp0_; + gpointer _tmp1_; #line 35 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 36 "/home/jens/Source/shotwell/src/core/util.vala" @@ -548,10 +548,10 @@ static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterat static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base) { SingletonCollectionSingletonIterator * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - SingletonCollection* _tmp1_ = NULL; - gconstpointer _tmp2_ = NULL; - gpointer _tmp3_ = NULL; + gboolean _tmp0_; + SingletonCollection* _tmp1_; + gconstpointer _tmp2_; + gpointer _tmp3_; #line 43 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 44 "/home/jens/Source/shotwell/src/core/util.vala" @@ -586,7 +586,7 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base) { SingletonCollectionSingletonIterator * self; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 53 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 54 "/home/jens/Source/shotwell/src/core/util.vala" @@ -594,7 +594,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba #line 54 "/home/jens/Source/shotwell/src/core/util.vala" if (!_tmp0_) { #line 597 "util.c" - SingletonCollection* _tmp1_ = NULL; + SingletonCollection* _tmp1_; #line 55 "/home/jens/Source/shotwell/src/core/util.vala" _tmp1_ = self->priv->c; #line 55 "/home/jens/Source/shotwell/src/core/util.vala" @@ -616,7 +616,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) { gboolean result; SingletonCollectionSingletonIterator* self; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 24 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 24 "/home/jens/Source/shotwell/src/core/util.vala" @@ -632,7 +632,7 @@ static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeI static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) { gboolean result; SingletonCollectionSingletonIterator* self; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 28 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 28 "/home/jens/Source/shotwell/src/core/util.vala" @@ -663,9 +663,9 @@ static void singleton_collection_singleton_iterator_class_init (SingletonCollect #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)); #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, 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, 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)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID, g_param_spec_boolean ("valid", "valid", "valid", 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_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" } @@ -695,13 +695,13 @@ static void singleton_collection_singleton_iterator_gee_traversable_interface_in #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" - iface->foreach = (gboolean (*)(GeeTraversable*, GeeForallFunc, void*)) singleton_collection_singleton_iterator_real_foreach; + iface->foreach = (gboolean (*) (GeeTraversable *, GeeForallFunc, void*)) singleton_collection_singleton_iterator_real_foreach; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - iface->get_g_type = (GType(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_type; + iface->get_g_type = (GType (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_type; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func; + 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; + iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func; #line 706 "util.c" } @@ -710,13 +710,13 @@ static void singleton_collection_singleton_iterator_gee_iterator_interface_init #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" - iface->get = (gpointer (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_get; + iface->get = (gpointer (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_get; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - iface->has_next = (gboolean (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_has_next; + iface->has_next = (gboolean (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_has_next; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - iface->next = (gboolean (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_next; + iface->next = (gboolean (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_next; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - iface->remove = (void (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_remove; + iface->remove = (void (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_remove; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" iface->get_read_only = singleton_collection_singleton_iterator_real_get_read_only; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -736,7 +736,7 @@ static void singleton_collection_singleton_iterator_instance_init (SingletonColl } -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); @@ -772,13 +772,13 @@ static void _vala_singleton_collection_singleton_iterator_get_property (GObject #line 14 "/home/jens/Source/shotwell/src/core/util.vala" switch (property_id) { #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - case SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY: + case SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" g_value_set_boolean (value, gee_iterator_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator))); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - case SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID: + case SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" 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" @@ -834,15 +834,15 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) { #line 13 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (SingletonCollectionPrivate)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->add = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_add; + ((GeeAbstractCollectionClass *) klass)->add = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_add; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->clear = (void (*)(GeeAbstractCollection*)) singleton_collection_real_clear; + ((GeeAbstractCollectionClass *) klass)->clear = (void (*) (GeeAbstractCollection *)) singleton_collection_real_clear; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_contains; + ((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_contains; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*)(GeeAbstractCollection*)) singleton_collection_real_iterator; + ((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*) (GeeAbstractCollection *)) singleton_collection_real_iterator; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_remove; + ((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_remove; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" GEE_ABSTRACT_COLLECTION_CLASS (klass)->get_read_only = singleton_collection_real_get_read_only; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -860,9 +860,9 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) { #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)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY, 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, 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)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE, 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)); + 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" } @@ -874,7 +874,7 @@ static void singleton_collection_instance_init (SingletonCollection * self) { } -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); @@ -904,13 +904,13 @@ static void _vala_singleton_collection_get_property (GObject * object, guint pro #line 13 "/home/jens/Source/shotwell/src/core/util.vala" switch (property_id) { #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - case SINGLETON_COLLECTION_READ_ONLY: + case SINGLETON_COLLECTION_READ_ONLY_PROPERTY: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" g_value_set_boolean (value, gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection))); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - case SINGLETON_COLLECTION_SIZE: + case SINGLETON_COLLECTION_SIZE_PROPERTY: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" 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" @@ -1059,9 +1059,9 @@ GType marker_get_type (void) { UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { UnknownTotalMonitor* self = NULL; - guint64 _tmp0_ = 0ULL; - ProgressMonitor _tmp1_ = NULL; - void* _tmp1__target = 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" @@ -1091,11 +1091,11 @@ UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor w gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total) { gboolean result = FALSE; - ProgressMonitor _tmp0_ = NULL; - void* _tmp0__target = NULL; - guint64 _tmp1_ = 0ULL; - guint64 _tmp2_ = 0ULL; - gboolean _tmp3_ = 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" @@ -1158,7 +1158,7 @@ static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { #line 1161 "util.c" - UnknownTotalMonitor* object; + 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) { @@ -1185,7 +1185,7 @@ static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_ static gchar* value_unknown_total_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - UnknownTotalMonitor** object_p; + UnknownTotalMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { @@ -1237,7 +1237,7 @@ gpointer value_get_unknown_total_monitor (const GValue* value) { void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { - UnknownTotalMonitor* old; + 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)); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1268,7 +1268,7 @@ void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { void value_take_unknown_total_monitor (GValue* value, gpointer v_object) { - UnknownTotalMonitor* old; + 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)); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1316,7 +1316,7 @@ static void unknown_total_monitor_instance_init (UnknownTotalMonitor * self) { } -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); @@ -1341,7 +1341,7 @@ GType unknown_total_monitor_get_type (void) { gpointer unknown_total_monitor_ref (gpointer instance) { - UnknownTotalMonitor* self; + UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); @@ -1352,7 +1352,7 @@ gpointer unknown_total_monitor_ref (gpointer instance) { void unknown_total_monitor_unref (gpointer instance) { - UnknownTotalMonitor* self; + UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1367,9 +1367,9 @@ void unknown_total_monitor_unref (gpointer instance) { AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { AggregateProgressMonitor* self = NULL; - guint64 _tmp0_ = 0ULL; - ProgressMonitor _tmp1_ = NULL; - void* _tmp1__target = 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" @@ -1398,13 +1398,13 @@ AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, P void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name) { - const gchar* _tmp0_ = NULL; - guint64 _tmp1_ = 0ULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - guint64 _tmp4_ = 0ULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp0_; + guint64 _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + guint64 _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" @@ -1438,16 +1438,16 @@ void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total) { gboolean result = FALSE; guint64 _tmp0_ = 0ULL; - guint64 _tmp1_ = 0ULL; - guint64 _tmp5_ = 0ULL; - guint64 _tmp6_ = 0ULL; - guint64 _tmp7_ = 0ULL; - guint64 _tmp9_ = 0ULL; - ProgressMonitor _tmp10_ = NULL; - void* _tmp10__target = NULL; - guint64 _tmp11_ = 0ULL; - guint64 _tmp12_ = 0ULL; - gboolean _tmp13_ = FALSE; + guint64 _tmp1_; + guint64 _tmp5_; + guint64 _tmp6_; + guint64 _tmp7_; + 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" @@ -1455,8 +1455,8 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui #line 177 "/home/jens/Source/shotwell/src/core/util.vala" if (_tmp1_ != G_MAXUINT64) { #line 1458 "util.c" - guint64 _tmp2_ = 0ULL; - guint64 _tmp3_ = 0ULL; + 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" @@ -1465,7 +1465,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui _tmp0_ = _tmp2_ - _tmp3_; #line 1467 "util.c" } else { - guint64 _tmp4_ = 0ULL; + guint64 _tmp4_; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" _tmp4_ = count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1483,7 +1483,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui #line 178 "/home/jens/Source/shotwell/src/core/util.vala" if (_tmp6_ > _tmp7_) { #line 1486 "util.c" - guint64 _tmp8_ = 0ULL; + guint64 _tmp8_; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" _tmp8_ = self->priv->grand_total; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1554,7 +1554,7 @@ static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, gui #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { #line 1557 "util.c" - AggregateProgressMonitor* object; + 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) { @@ -1581,7 +1581,7 @@ static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, gui static gchar* value_aggregate_progress_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - AggregateProgressMonitor** object_p; + AggregateProgressMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { @@ -1633,7 +1633,7 @@ gpointer value_get_aggregate_progress_monitor (const GValue* value) { void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { - AggregateProgressMonitor* old; + 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)); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1664,7 +1664,7 @@ void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) { - AggregateProgressMonitor* old; + 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)); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1716,7 +1716,7 @@ static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor * } -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); @@ -1741,7 +1741,7 @@ GType aggregate_progress_monitor_get_type (void) { gpointer aggregate_progress_monitor_ref (gpointer instance) { - AggregateProgressMonitor* self; + AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); @@ -1752,7 +1752,7 @@ gpointer aggregate_progress_monitor_ref (gpointer instance) { void aggregate_progress_monitor_unref (gpointer instance) { - AggregateProgressMonitor* self; + AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1777,7 +1777,7 @@ gboolean null_progress_monitor (guint64 count, guint64 total) { gdouble degrees_to_radians (gdouble theta) { gdouble result = 0.0; - gdouble _tmp0_ = 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" |