From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/tags/HierarchicalTagIndex.c | 695 ++++++----- src/tags/HierarchicalTagUtilities.c | 2363 ++++++++++++++++------------------- src/tags/TagPage.c | 651 ++++++---- src/tags/Tags.c | 15 +- src/tags/TagsBranch.c | 1988 +++++++++++++++-------------- 5 files changed, 2928 insertions(+), 2784 deletions(-) (limited to 'src/tags') diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c index c57a25f..44d6fae 100644 --- a/src/tags/HierarchicalTagIndex.c +++ b/src/tags/HierarchicalTagIndex.c @@ -1,4 +1,4 @@ -/* HierarchicalTagIndex.c generated by valac 0.36.6, the Vala compiler +/* HierarchicalTagIndex.c generated by valac 0.40.4, the Vala compiler * generated from HierarchicalTagIndex.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -106,27 +107,38 @@ extern TagSourceCollection* tag_global; gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; #define HIERARCHICAL_TAG_INDEX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndexPrivate)) -enum { - HIERARCHICAL_TAG_INDEX_DUMMY_PROPERTY -}; HierarchicalTagIndex* hierarchical_tag_index_new (void); HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type); HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths); #define TAG_PATH_SEPARATOR_STRING "/" GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path); +void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path); HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -135,18 +147,33 @@ GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self); GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self); -gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag); +gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, + const gchar* tag); GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self); -gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path); -gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name); -gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1); -static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value); +gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, + const gchar* path); +gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, + const gchar* name); +gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, + gchar** names, + int names_length1, + int* result_length1); +static void _vala_array_add68 (gchar** * array, + int* length, + int* size, + gchar* value); static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) { +HierarchicalTagIndex* +hierarchical_tag_index_construct (GType object_type) +{ HierarchicalTagIndex* self = NULL; GeeHashMap* _tmp0_; GeeTreeSet* _tmp1_; @@ -166,170 +193,162 @@ HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) { self->priv->known_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 11 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return self; -#line 170 "HierarchicalTagIndex.c" +#line 197 "HierarchicalTagIndex.c" } -HierarchicalTagIndex* hierarchical_tag_index_new (void) { +HierarchicalTagIndex* +hierarchical_tag_index_new (void) +{ #line 11 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return hierarchical_tag_index_construct (TYPE_HIERARCHICAL_TAG_INDEX); -#line 177 "HierarchicalTagIndex.c" +#line 206 "HierarchicalTagIndex.c" } -HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths) { +HierarchicalTagIndex* +hierarchical_tag_index_from_paths (GeeCollection* client_paths) +{ HierarchicalTagIndex* result = NULL; GeeCollection* paths = NULL; GeeCollection* _tmp0_; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; HierarchicalTagIndex* _result_ = NULL; - HierarchicalTagIndex* _tmp3_; + HierarchicalTagIndex* _tmp2_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (GEE_IS_COLLECTION (client_paths), NULL); #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp0_ = client_paths; + _tmp0_ = gee_collection_get_read_only_view (client_paths); #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = gee_collection_get_read_only_view (_tmp0_); + _tmp1_ = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = _tmp1_; -#line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - paths = _tmp2_; + paths = _tmp1_; #line 19 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = hierarchical_tag_index_new (); + _tmp2_ = hierarchical_tag_index_new (); #line 19 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _result_ = _tmp3_; -#line 203 "HierarchicalTagIndex.c" + _result_ = _tmp2_; +#line 231 "HierarchicalTagIndex.c" { GeeIterator* _path_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = paths; + _tmp3_ = paths; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _path_it = _tmp5_; + _path_it = _tmp4_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { -#line 216 "HierarchicalTagIndex.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 244 "HierarchicalTagIndex.c" + GeeIterator* _tmp5_; gchar* path = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - const gchar* _tmp10_; - gboolean _tmp11_; -#line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = _path_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + const gchar* _tmp8_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _path_it; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" break; -#line 232 "HierarchicalTagIndex.c" +#line 256 "HierarchicalTagIndex.c" } #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp8_ = _path_it; + _tmp6_ = _path_it; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - path = (gchar*) _tmp9_; -#line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp10_ = path; + path = (gchar*) _tmp7_; #line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp11_ = g_str_has_prefix (_tmp10_, TAG_PATH_SEPARATOR_STRING); + _tmp8_ = path; #line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (_tmp11_) { -#line 246 "HierarchicalTagIndex.c" + if (g_str_has_prefix (_tmp8_, TAG_PATH_SEPARATOR_STRING)) { +#line 268 "HierarchicalTagIndex.c" GeeCollection* components = NULL; - const gchar* _tmp12_; - GeeList* _tmp13_; + const gchar* _tmp9_; + GeeList* _tmp10_; #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp12_ = path; + _tmp9_ = path; #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp13_ = hierarchical_tag_utilities_enumerate_path_components (_tmp12_); + _tmp10_ = hierarchical_tag_utilities_enumerate_path_components (_tmp9_); #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - components = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection); -#line 256 "HierarchicalTagIndex.c" + components = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection); +#line 278 "HierarchicalTagIndex.c" { GeeIterator* _component_it = NULL; - GeeCollection* _tmp14_; - GeeIterator* _tmp15_; + GeeCollection* _tmp11_; + GeeIterator* _tmp12_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp14_ = components; + _tmp11_ = components; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable)); #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _component_it = _tmp15_; + _component_it = _tmp12_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { -#line 269 "HierarchicalTagIndex.c" - GeeIterator* _tmp16_; - gboolean _tmp17_; +#line 291 "HierarchicalTagIndex.c" + GeeIterator* _tmp13_; gchar* component = NULL; - GeeIterator* _tmp18_; - gpointer _tmp19_; - HierarchicalTagIndex* _tmp20_; - const gchar* _tmp21_; - const gchar* _tmp22_; + GeeIterator* _tmp14_; + gpointer _tmp15_; + HierarchicalTagIndex* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp16_ = _component_it; + _tmp13_ = _component_it; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp17_ = gee_iterator_next (_tmp16_); -#line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp17_) { + if (!gee_iterator_next (_tmp13_)) { #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" break; -#line 286 "HierarchicalTagIndex.c" +#line 305 "HierarchicalTagIndex.c" } #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp18_ = _component_it; + _tmp14_ = _component_it; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp19_ = gee_iterator_get (_tmp18_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - component = (gchar*) _tmp19_; + component = (gchar*) _tmp15_; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp20_ = _result_; + _tmp16_ = _result_; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp21_ = component; + _tmp17_ = component; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp22_ = path; + _tmp18_ = path; #line 27 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - hierarchical_tag_index_add_path (_tmp20_, _tmp21_, _tmp22_); + hierarchical_tag_index_add_path (_tmp16_, _tmp17_, _tmp18_); #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (component); -#line 304 "HierarchicalTagIndex.c" +#line 323 "HierarchicalTagIndex.c" } #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (_component_it); -#line 308 "HierarchicalTagIndex.c" +#line 327 "HierarchicalTagIndex.c" } #line 22 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (components); -#line 312 "HierarchicalTagIndex.c" +#line 331 "HierarchicalTagIndex.c" } else { - HierarchicalTagIndex* _tmp23_; - const gchar* _tmp24_; - const gchar* _tmp25_; + HierarchicalTagIndex* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp23_ = _result_; + _tmp19_ = _result_; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp24_ = path; + _tmp20_ = path; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp25_ = path; + _tmp21_ = path; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - hierarchical_tag_index_add_path (_tmp23_, _tmp24_, _tmp25_); -#line 325 "HierarchicalTagIndex.c" + hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_); +#line 344 "HierarchicalTagIndex.c" } #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (path); -#line 329 "HierarchicalTagIndex.c" +#line 348 "HierarchicalTagIndex.c" } #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (_path_it); -#line 333 "HierarchicalTagIndex.c" +#line 352 "HierarchicalTagIndex.c" } #line 33 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" result = _result_; @@ -337,11 +356,13 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p _g_object_unref0 (paths); #line 33 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 341 "HierarchicalTagIndex.c" +#line 360 "HierarchicalTagIndex.c" } -HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) { +HierarchicalTagIndex* +hierarchical_tag_index_get_global_index (void) +{ HierarchicalTagIndex* result = NULL; TagSourceCollection* _tmp0_; GeeCollection* _tmp1_; @@ -364,21 +385,20 @@ HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) { result = _tmp4_; #line 37 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 368 "HierarchicalTagIndex.c" +#line 389 "HierarchicalTagIndex.c" } -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path) { +void +hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path) +{ GeeMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; - GeeMap* _tmp7_; - const gchar* _tmp8_; - gpointer _tmp9_; - GeeCollection* _tmp10_; - const gchar* _tmp11_; - GeeSortedSet* _tmp12_; - const gchar* _tmp13_; + GeeMap* _tmp4_; + gpointer _tmp5_; + GeeCollection* _tmp6_; + GeeSortedSet* _tmp7_; #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (IS_HIERARCHICAL_TAG_INDEX (self)); #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -388,55 +408,44 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t #line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp0_ = self->priv->tag_table; #line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = tag; -#line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = gee_map_has_key (_tmp0_, _tmp1_); -#line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp2_) { -#line 397 "HierarchicalTagIndex.c" - GeeMap* _tmp3_; - const gchar* _tmp4_; - GeeArrayList* _tmp5_; - GeeArrayList* _tmp6_; + if (!gee_map_has_key (_tmp0_, tag)) { +#line 413 "HierarchicalTagIndex.c" + GeeMap* _tmp1_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp3_; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = self->priv->tag_table; + _tmp1_ = self->priv->tag_table; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = tag; + _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp3_ = _tmp2_; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = _tmp5_; + gee_map_set (_tmp1_, tag, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - gee_map_set (_tmp3_, _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _g_object_unref0 (_tmp6_); -#line 414 "HierarchicalTagIndex.c" + _g_object_unref0 (_tmp3_); +#line 427 "HierarchicalTagIndex.c" } #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp7_ = self->priv->tag_table; -#line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp8_ = tag; -#line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp9_ = gee_map_get (_tmp7_, _tmp8_); + _tmp4_ = self->priv->tag_table; #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp10_ = (GeeCollection*) _tmp9_; + _tmp5_ = gee_map_get (_tmp4_, tag); #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp11_ = path; + _tmp6_ = (GeeCollection*) _tmp5_; #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - gee_collection_add (_tmp10_, _tmp11_); + gee_collection_add (_tmp6_, path); #line 45 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _g_object_unref0 (_tmp10_); -#line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp12_ = self->priv->known_paths; + _g_object_unref0 (_tmp6_); #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp13_ = path; + _tmp7_ = self->priv->known_paths; #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); -#line 436 "HierarchicalTagIndex.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), path); +#line 443 "HierarchicalTagIndex.c" } -GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) { +GeeCollection* +hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) +{ GeeCollection* result = NULL; GeeSortedSet* _tmp0_; GeeSortedSet* _tmp1_; @@ -453,15 +462,16 @@ GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 457 "HierarchicalTagIndex.c" +#line 466 "HierarchicalTagIndex.c" } -gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag) { +gboolean +hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, + const gchar* tag) +{ gboolean result = FALSE; GeeMap* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE); #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -469,18 +479,16 @@ gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, con #line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp0_ = self->priv->tag_table; #line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = tag; -#line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = gee_map_has_key (_tmp0_, _tmp1_); -#line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp2_; + result = gee_map_has_key (_tmp0_, tag); #line 54 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 480 "HierarchicalTagIndex.c" +#line 486 "HierarchicalTagIndex.c" } -GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) { +GeeCollection* +hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) +{ GeeCollection* result = NULL; GeeMap* _tmp0_; GeeSet* _tmp1_; @@ -497,15 +505,16 @@ GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 58 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 501 "HierarchicalTagIndex.c" +#line 509 "HierarchicalTagIndex.c" } -gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path) { +gboolean +hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, + const gchar* path) +{ gboolean result = FALSE; GeeSortedSet* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE); #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -513,128 +522,109 @@ gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const #line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp0_ = self->priv->known_paths; #line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = path; -#line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_); -#line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp2_; + result = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), path); #line 62 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 524 "HierarchicalTagIndex.c" +#line 529 "HierarchicalTagIndex.c" } -gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name) { +gchar* +hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, + const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; GeeCollection* paths = NULL; - GeeMap* _tmp4_; - const gchar* _tmp5_; - gpointer _tmp6_; + GeeMap* _tmp1_; + gpointer _tmp2_; #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (name != NULL, NULL); #line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp0_ = name; -#line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = hierarchical_tag_index_is_tag_in_index (self, _tmp0_); -#line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp1_) { -#line 546 "HierarchicalTagIndex.c" - const gchar* _tmp2_; - gchar* _tmp3_; -#line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = name; + if (!hierarchical_tag_index_is_tag_in_index (self, name)) { +#line 547 "HierarchicalTagIndex.c" + gchar* _tmp0_; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp0_ = g_strdup (name); #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp3_; + result = _tmp0_; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 557 "HierarchicalTagIndex.c" +#line 555 "HierarchicalTagIndex.c" } #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = self->priv->tag_table; -#line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = name; + _tmp1_ = self->priv->tag_table; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = gee_map_get (_tmp4_, _tmp5_); + _tmp2_ = gee_map_get (_tmp1_, name); #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - paths = (GeeCollection*) _tmp6_; -#line 567 "HierarchicalTagIndex.c" + paths = (GeeCollection*) _tmp2_; +#line 563 "HierarchicalTagIndex.c" { GeeIterator* _path_it = NULL; - GeeCollection* _tmp7_; - GeeIterator* _tmp8_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp7_ = paths; + _tmp3_ = paths; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _path_it = _tmp8_; + _path_it = _tmp4_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { -#line 580 "HierarchicalTagIndex.c" - GeeIterator* _tmp9_; - gboolean _tmp10_; +#line 576 "HierarchicalTagIndex.c" + GeeIterator* _tmp5_; gchar* path = NULL; - GeeIterator* _tmp11_; - gpointer _tmp12_; + GeeIterator* _tmp6_; + gpointer _tmp7_; GeeList* components = NULL; - const gchar* _tmp13_; - GeeList* _tmp14_; - GeeList* _tmp15_; - GeeList* _tmp16_; - gint _tmp17_; - gint _tmp18_; - gpointer _tmp19_; - gchar* _tmp20_; - const gchar* _tmp21_; - gboolean _tmp22_; + const gchar* _tmp8_; + GeeList* _tmp9_; + GeeList* _tmp10_; + GeeList* _tmp11_; + gint _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + gchar* _tmp15_; + gboolean _tmp16_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp9_ = _path_it; + _tmp5_ = _path_it; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp10_ = gee_iterator_next (_tmp9_); -#line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (!_tmp10_) { + if (!gee_iterator_next (_tmp5_)) { #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" break; -#line 605 "HierarchicalTagIndex.c" +#line 597 "HierarchicalTagIndex.c" } #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp11_ = _path_it; + _tmp6_ = _path_it; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp12_ = gee_iterator_get (_tmp11_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - path = (gchar*) _tmp12_; + path = (gchar*) _tmp7_; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp13_ = path; + _tmp8_ = path; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp14_ = hierarchical_tag_utilities_enumerate_path_components (_tmp13_); + _tmp9_ = hierarchical_tag_utilities_enumerate_path_components (_tmp8_); #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - components = _tmp14_; -#line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp15_ = components; + components = _tmp9_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp16_ = components; + _tmp10_ = components; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp11_ = components; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp18_ = _tmp17_; + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp19_ = gee_list_get (_tmp15_, _tmp18_ - 1); + _tmp13_ = _tmp12_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp20_ = (gchar*) _tmp19_; + _tmp14_ = gee_list_get (_tmp10_, _tmp13_ - 1); #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp21_ = name; + _tmp15_ = (gchar*) _tmp14_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp22_ = g_strcmp0 (_tmp20_, _tmp21_) == 0; + _tmp16_ = g_strcmp0 (_tmp15_, name) == 0; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp15_); #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - if (_tmp22_) { + if (_tmp16_) { #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" result = path; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -645,53 +635,61 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con _g_object_unref0 (paths); #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 649 "HierarchicalTagIndex.c" +#line 639 "HierarchicalTagIndex.c" } #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (components); #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (path); -#line 655 "HierarchicalTagIndex.c" +#line 645 "HierarchicalTagIndex.c" } #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (_path_it); -#line 659 "HierarchicalTagIndex.c" +#line 649 "HierarchicalTagIndex.c" } #line 77 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_assert_not_reached (); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (paths); -#line 665 "HierarchicalTagIndex.c" +#line 655 "HierarchicalTagIndex.c" } -static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value) { +static void +_vala_array_add68 (gchar** * array, + int* length, + int* size, + gchar* value) +{ #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if ((*length) == (*size)) { #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *size = (*size) ? (2 * (*size)) : 4; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 676 "HierarchicalTagIndex.c" +#line 671 "HierarchicalTagIndex.c" } #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" (*array)[(*length)++] = value; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" (*array)[*length] = NULL; -#line 682 "HierarchicalTagIndex.c" +#line 677 "HierarchicalTagIndex.c" } -gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1) { +gchar** +hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, + gchar** names, + int names_length1, + int* result_length1) +{ gchar** result = NULL; gchar** _result_ = NULL; gchar** _tmp0_; gint _result__length1; gint __result__size_; - gchar** _tmp1_; - gint _tmp1__length1; - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 80 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 81 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -702,167 +700,188 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* _result__length1 = 0; #line 81 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" __result__size_ = _result__length1; -#line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1_ = names; -#line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp1__length1 = names_length1; -#line 710 "HierarchicalTagIndex.c" +#line 704 "HierarchicalTagIndex.c" { gchar** name_collection = NULL; gint name_collection_length1 = 0; gint _name_collection_size_ = 0; gint name_it = 0; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - name_collection = _tmp1_; + name_collection = names; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - name_collection_length1 = _tmp1__length1; + name_collection_length1 = names_length1; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - for (name_it = 0; name_it < _tmp1__length1; name_it = name_it + 1) { -#line 722 "HierarchicalTagIndex.c" - gchar* _tmp2_; + for (name_it = 0; name_it < names_length1; name_it = name_it + 1) { +#line 716 "HierarchicalTagIndex.c" + gchar* _tmp1_; gchar* name = NULL; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp2_ = g_strdup (name_collection[name_it]); + _tmp1_ = g_strdup (name_collection[name_it]); #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - name = _tmp2_; -#line 729 "HierarchicalTagIndex.c" + name = _tmp1_; +#line 723 "HierarchicalTagIndex.c" { - gchar** _tmp3_; - gint _tmp3__length1; - const gchar* _tmp4_; - gchar* _tmp5_; + gchar** _tmp2_; + gint _tmp2__length1; + const gchar* _tmp3_; + gchar* _tmp4_; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3_ = _result_; + _tmp2_ = _result_; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp3__length1 = _result__length1; + _tmp2__length1 = _result__length1; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp4_ = name; + _tmp3_ = name; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp5_ = hierarchical_tag_index_get_path_for_name (self, _tmp4_); + _tmp4_ = hierarchical_tag_index_get_path_for_name (self, _tmp3_); #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _vala_array_add68 (&_result_, &_result__length1, &__result__size_, _tmp5_); + _vala_array_add68 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (name); -#line 747 "HierarchicalTagIndex.c" +#line 741 "HierarchicalTagIndex.c" } } } #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6_ = _result_; + _tmp5_ = _result_; #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _tmp6__length1 = _result__length1; + _tmp5__length1 = _result__length1; #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (result_length1) { #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - *result_length1 = _tmp6__length1; -#line 759 "HierarchicalTagIndex.c" + *result_length1 = _tmp5__length1; +#line 753 "HierarchicalTagIndex.c" } #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - result = _tmp6_; + result = _tmp5_; #line 86 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return result; -#line 765 "HierarchicalTagIndex.c" +#line 759 "HierarchicalTagIndex.c" } -static void value_hierarchical_tag_index_init (GValue* value) { +static void +value_hierarchical_tag_index_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 772 "HierarchicalTagIndex.c" +#line 768 "HierarchicalTagIndex.c" } -static void value_hierarchical_tag_index_free_value (GValue* value) { +static void +value_hierarchical_tag_index_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_unref (value->data[0].v_pointer); -#line 781 "HierarchicalTagIndex.c" +#line 779 "HierarchicalTagIndex.c" } } -static void value_hierarchical_tag_index_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_hierarchical_tag_index_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" dest_value->data[0].v_pointer = hierarchical_tag_index_ref (src_value->data[0].v_pointer); -#line 791 "HierarchicalTagIndex.c" +#line 792 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" dest_value->data[0].v_pointer = NULL; -#line 795 "HierarchicalTagIndex.c" +#line 796 "HierarchicalTagIndex.c" } } -static gpointer value_hierarchical_tag_index_peek_pointer (const GValue* value) { +static gpointer +value_hierarchical_tag_index_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return value->data[0].v_pointer; -#line 803 "HierarchicalTagIndex.c" +#line 806 "HierarchicalTagIndex.c" } -static gchar* value_hierarchical_tag_index_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_index_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (collect_values[0].v_pointer) { -#line 810 "HierarchicalTagIndex.c" +#line 818 "HierarchicalTagIndex.c" HierarchicalTagIndex * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 817 "HierarchicalTagIndex.c" +#line 825 "HierarchicalTagIndex.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.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 821 "HierarchicalTagIndex.c" +#line 829 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = hierarchical_tag_index_ref (object); -#line 825 "HierarchicalTagIndex.c" +#line 833 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 829 "HierarchicalTagIndex.c" +#line 837 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return NULL; -#line 833 "HierarchicalTagIndex.c" +#line 841 "HierarchicalTagIndex.c" } -static gchar* value_hierarchical_tag_index_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_index_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ HierarchicalTagIndex ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 844 "HierarchicalTagIndex.c" +#line 857 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *object_p = NULL; -#line 850 "HierarchicalTagIndex.c" +#line 863 "HierarchicalTagIndex.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *object_p = value->data[0].v_pointer; -#line 854 "HierarchicalTagIndex.c" +#line 867 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" *object_p = hierarchical_tag_index_ref (value->data[0].v_pointer); -#line 858 "HierarchicalTagIndex.c" +#line 871 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return NULL; -#line 862 "HierarchicalTagIndex.c" +#line 875 "HierarchicalTagIndex.c" } -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecHierarchicalTagIndex* spec; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_HIERARCHICAL_TAG_INDEX), NULL); @@ -872,20 +891,25 @@ GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return G_PARAM_SPEC (spec); -#line 876 "HierarchicalTagIndex.c" +#line 895 "HierarchicalTagIndex.c" } -gpointer value_get_hierarchical_tag_index (const GValue* value) { +gpointer +value_get_hierarchical_tag_index (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX), NULL); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return value->data[0].v_pointer; -#line 885 "HierarchicalTagIndex.c" +#line 906 "HierarchicalTagIndex.c" } -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) { +void +value_set_hierarchical_tag_index (GValue* value, + gpointer v_object) +{ HierarchicalTagIndex * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX)); @@ -901,22 +925,25 @@ void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_ref (value->data[0].v_pointer); -#line 905 "HierarchicalTagIndex.c" +#line 929 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 909 "HierarchicalTagIndex.c" +#line 933 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_unref (old); -#line 915 "HierarchicalTagIndex.c" +#line 939 "HierarchicalTagIndex.c" } } -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object) { +void +value_take_hierarchical_tag_index (GValue* value, + gpointer v_object) +{ HierarchicalTagIndex * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX)); @@ -930,42 +957,48 @@ void value_take_hierarchical_tag_index (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/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = v_object; -#line 934 "HierarchicalTagIndex.c" +#line 961 "HierarchicalTagIndex.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" value->data[0].v_pointer = NULL; -#line 938 "HierarchicalTagIndex.c" +#line 965 "HierarchicalTagIndex.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_unref (old); -#line 944 "HierarchicalTagIndex.c" +#line 971 "HierarchicalTagIndex.c" } } -static void hierarchical_tag_index_class_init (HierarchicalTagIndexClass * klass) { +static void +hierarchical_tag_index_class_init (HierarchicalTagIndexClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" hierarchical_tag_index_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" ((HierarchicalTagIndexClass *) klass)->finalize = hierarchical_tag_index_finalize; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_type_class_add_private (klass, sizeof (HierarchicalTagIndexPrivate)); -#line 956 "HierarchicalTagIndex.c" +#line 985 "HierarchicalTagIndex.c" } -static void hierarchical_tag_index_instance_init (HierarchicalTagIndex * self) { +static void +hierarchical_tag_index_instance_init (HierarchicalTagIndex * self) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self->priv = HIERARCHICAL_TAG_INDEX_GET_PRIVATE (self); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self->ref_count = 1; -#line 965 "HierarchicalTagIndex.c" +#line 996 "HierarchicalTagIndex.c" } -static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) { +static void +hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) +{ HierarchicalTagIndex * self; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndex); @@ -975,11 +1008,13 @@ static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) { _g_object_unref0 (self->priv->tag_table); #line 9 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_object_unref0 (self->priv->known_paths); -#line 979 "HierarchicalTagIndex.c" +#line 1012 "HierarchicalTagIndex.c" } -GType hierarchical_tag_index_get_type (void) { +GType +hierarchical_tag_index_get_type (void) +{ static volatile gsize hierarchical_tag_index_type_id__volatile = 0; if (g_once_init_enter (&hierarchical_tag_index_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_hierarchical_tag_index_init, value_hierarchical_tag_index_free_value, value_hierarchical_tag_index_copy_value, value_hierarchical_tag_index_peek_pointer, "p", value_hierarchical_tag_index_collect_value, "p", value_hierarchical_tag_index_lcopy_value }; @@ -993,18 +1028,22 @@ GType hierarchical_tag_index_get_type (void) { } -gpointer hierarchical_tag_index_ref (gpointer instance) { +gpointer +hierarchical_tag_index_ref (gpointer instance) +{ HierarchicalTagIndex * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" return instance; -#line 1004 "HierarchicalTagIndex.c" +#line 1041 "HierarchicalTagIndex.c" } -void hierarchical_tag_index_unref (gpointer instance) { +void +hierarchical_tag_index_unref (gpointer instance) +{ HierarchicalTagIndex * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -1013,12 +1052,16 @@ void hierarchical_tag_index_unref (gpointer instance) { HIERARCHICAL_TAG_INDEX_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1017 "HierarchicalTagIndex.c" +#line 1056 "HierarchicalTagIndex.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1030,7 +1073,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c index 2a1695b..554ce6c 100644 --- a/src/tags/HierarchicalTagUtilities.c +++ b/src/tags/HierarchicalTagUtilities.c @@ -1,4 +1,4 @@ -/* HierarchicalTagUtilities.c generated by valac 0.36.6, the Vala compiler +/* HierarchicalTagUtilities.c generated by valac 0.40.4, the Vala compiler * generated from HierarchicalTagUtilities.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -147,48 +148,70 @@ extern TagSourceCollection* tag_global; gpointer hierarchical_tag_utilities_ref (gpointer instance); void hierarchical_tag_utilities_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_utilities (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_utilities (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_utilities (const GValue* value); GType hierarchical_tag_utilities_get_type (void) G_GNUC_CONST; -enum { - HIERARCHICAL_TAG_UTILITIES_DUMMY_PROPERTY -}; gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name); #define TAG_PATH_SEPARATOR_STRING "/" gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path); GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); -gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1); +gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, + int path_components_length1); gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path); -gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator); +gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, + const gchar* foreign_separator); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords); HierarchicalTagIndex* hierarchical_tag_index_new (void); HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type); -gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path); -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path); +gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, + const gchar* path); +void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path); gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); void hierarchical_tag_utilities_cleanup_root_path (const gchar* path); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; @@ -199,8 +222,12 @@ void tag_flatten (Tag* self); HierarchicalTagUtilities* hierarchical_tag_utilities_new (void); HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_type); static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -209,42 +236,32 @@ static gint _vala_array_length (gpointer array); * hierarchical tag data model (e.g., "/Animals"). if 'name' is already a path compatible with * the hierarchical data model, 'name' is returned untouched */ -gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { +gchar* +hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; #line 14 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (name != NULL, NULL); #line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = name; -#line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING); -#line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp1_) { -#line 225 "HierarchicalTagUtilities.c" - const gchar* _tmp2_; - gchar* _tmp3_; + if (!g_str_has_prefix (name, TAG_PATH_SEPARATOR_STRING)) { +#line 248 "HierarchicalTagUtilities.c" + gchar* _tmp0_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = name; + _tmp0_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, name, NULL); #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp2_, NULL); -#line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp3_; + result = _tmp0_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 236 "HierarchicalTagUtilities.c" +#line 256 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp1_; #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = name; + _tmp1_ = g_strdup (name); #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp5_; + result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 248 "HierarchicalTagUtilities.c" +#line 265 "HierarchicalTagUtilities.c" } } @@ -256,229 +273,163 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { * only one path component; invoking this method with a 'path' argument other than a top-level * path will cause an assertion failure. */ -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 279 "HierarchicalTagUtilities.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 287 "HierarchicalTagUtilities.c" +#line 297 "HierarchicalTagUtilities.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 299 "HierarchicalTagUtilities.c" +#line 306 "HierarchicalTagUtilities.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 323 "HierarchicalTagUtilities.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 329 "HierarchicalTagUtilities.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 327 "HierarchicalTagUtilities.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 333 "HierarchicalTagUtilities.c" +#line 331 "HierarchicalTagUtilities.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); #line 337 "HierarchicalTagUtilities.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 349 "HierarchicalTagUtilities.c" } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 359 "HierarchicalTagUtilities.c" + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 347 "HierarchicalTagUtilities.c" } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 365 "HierarchicalTagUtilities.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 379 "HierarchicalTagUtilities.c" +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 351 "HierarchicalTagUtilities.c" + glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 359 "HierarchicalTagUtilities.c" } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 389 "HierarchicalTagUtilities.c" + glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 366 "HierarchicalTagUtilities.c" } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 395 "HierarchicalTagUtilities.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 404 "HierarchicalTagUtilities.c" +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 370 "HierarchicalTagUtilities.c" + glong _tmp5_; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 376 "HierarchicalTagUtilities.c" } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 424 "HierarchicalTagUtilities.c" +#line 388 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { +gchar* +hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_; #line 28 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (path != NULL, NULL); #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = path; -#line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING); -#line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp1_) { -#line 440 "HierarchicalTagUtilities.c" - const gchar* _tmp2_; - GeeList* _tmp3_; - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; + if (g_str_has_prefix (path, TAG_PATH_SEPARATOR_STRING)) { +#line 400 "HierarchicalTagUtilities.c" + GeeList* _tmp0_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gchar* _tmp4_; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = path; + _tmp0_ = hierarchical_tag_utilities_enumerate_path_components (path); #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = hierarchical_tag_utilities_enumerate_path_components (_tmp2_); + _tmp1_ = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = _tmp3_; -#line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _vala_assert (_tmp6_ == 1, "enumerate_path_components(path).size == 1"); + _vala_assert (_tmp3_ == 1, "enumerate_path_components(path).size == 1"); #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_object_unref0 (_tmp4_); -#line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = path; + _g_object_unref0 (_tmp1_); #line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = string_substring (_tmp7_, (glong) 1, (glong) -1); + _tmp4_ = string_substring (path, (glong) 1, (glong) -1); #line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp8_; + result = _tmp4_; #line 32 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 470 "HierarchicalTagUtilities.c" +#line 424 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp9_; - gchar* _tmp10_; -#line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = path; + gchar* _tmp5_; #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp5_ = g_strdup (path); #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp10_; + result = _tmp5_; #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 482 "HierarchicalTagUtilities.c" +#line 433 "HierarchicalTagUtilities.c" } } @@ -488,136 +439,135 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { * from most basic to most derived. For example, if 'path' == "/Animals/Mammals/Elephant", * the list { "/Animals", "/Animals/Mammals" } is returned */ -GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path) { +GeeList* +hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path) +{ GeeList* result = NULL; gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GeeList* _result_ = NULL; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; gchar* accumulator = NULL; - gchar* _tmp3_; + gchar* _tmp2_; #line 43 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_path; -#line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp0_); + _tmp0_ = hierarchical_tag_utilities_flat_to_hierarchical (in_path); #line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp1_; + path = _tmp0_; #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); + _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList); #line 48 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = g_strdup (""); + _tmp2_ = g_strdup (""); #line 48 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - accumulator = _tmp3_; -#line 517 "HierarchicalTagUtilities.c" + accumulator = _tmp2_; +#line 467 "HierarchicalTagUtilities.c" { GeeList* _component_list = NULL; - const gchar* _tmp4_; - GeeList* _tmp5_; + const gchar* _tmp3_; + GeeList* _tmp4_; gint _component_size = 0; - GeeList* _tmp6_; + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; gint _component_index = 0; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = path; + _tmp3_ = path; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = hierarchical_tag_utilities_enumerate_path_components (_tmp4_); + _tmp4_ = hierarchical_tag_utilities_enumerate_path_components (_tmp3_); #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _component_list = _tmp5_; + _component_list = _tmp4_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = _component_list; + _tmp5_ = _component_list; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _component_size = _tmp8_; + _component_size = _tmp7_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _component_index = -1; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 545 "HierarchicalTagUtilities.c" +#line 495 "HierarchicalTagUtilities.c" + gint _tmp8_; gint _tmp9_; gint _tmp10_; - gint _tmp11_; gchar* component = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; + GeeList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; + const gchar* _tmp14_; const gchar* _tmp15_; - const gchar* _tmp16_; + gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = _component_index; + _tmp8_ = _component_index; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _component_index = _tmp9_ + 1; + _component_index = _tmp8_ + 1; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = _component_index; + _tmp9_ = _component_index; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = _component_size; + _tmp10_ = _component_size; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp9_ < _tmp10_)) { #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 572 "HierarchicalTagUtilities.c" +#line 522 "HierarchicalTagUtilities.c" } #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = _component_list; + _tmp11_ = _component_list; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _component_index; + _tmp12_ = _component_index; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp13_ = gee_list_get (_tmp11_, _tmp12_); #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component = (gchar*) _tmp14_; + component = (gchar*) _tmp13_; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = accumulator; + _tmp14_ = accumulator; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = component; + _tmp15_ = component; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp16_, NULL); + _tmp16_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp15_, NULL); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = g_strconcat (_tmp15_, _tmp18_, NULL); + _tmp18_ = g_strconcat (_tmp14_, _tmp17_, NULL); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (accumulator); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - accumulator = _tmp19_; + accumulator = _tmp18_; #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = accumulator; + _tmp19_ = accumulator; #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp21_ = path; + _tmp20_ = path; #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (g_strcmp0 (_tmp20_, _tmp21_) != 0) { -#line 604 "HierarchicalTagUtilities.c" - GeeList* _tmp22_; - const gchar* _tmp23_; + if (g_strcmp0 (_tmp19_, _tmp20_) != 0) { +#line 554 "HierarchicalTagUtilities.c" + GeeList* _tmp21_; + const gchar* _tmp22_; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp22_ = _result_; + _tmp21_ = _result_; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp23_ = accumulator; + _tmp22_ = accumulator; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 613 "HierarchicalTagUtilities.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); +#line 563 "HierarchicalTagUtilities.c" } #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (component); -#line 617 "HierarchicalTagUtilities.c" +#line 567 "HierarchicalTagUtilities.c" } #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (_component_list); -#line 621 "HierarchicalTagUtilities.c" +#line 571 "HierarchicalTagUtilities.c" } #line 55 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = _result_; @@ -627,7 +577,7 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path _g_free0 (path); #line 55 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 631 "HierarchicalTagUtilities.c" +#line 581 "HierarchicalTagUtilities.c" } @@ -637,101 +587,100 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path * 'path' == "/Animals/Mammals/Elephant" the list { "Animals", "Mammals", "Elephant" } will * be returned */ -GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path) { +GeeList* +hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path) +{ GeeList* result = NULL; gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GeeArrayList* components = NULL; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; gchar** raw_components = NULL; - const gchar* _tmp3_; + const gchar* _tmp2_; + gchar** _tmp3_; gchar** _tmp4_; - gchar** _tmp5_; gint raw_components_length1; gint _raw_components_size_; - gchar** _tmp6_; - gint _tmp6__length1; - GeeArrayList* _tmp11_; + gchar** _tmp5_; + gint _tmp5__length1; + GeeArrayList* _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; #line 64 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_path; -#line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp0_); + _tmp0_ = hierarchical_tag_utilities_flat_to_hierarchical (in_path); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp1_; + path = _tmp0_; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - components = _tmp2_; + components = _tmp1_; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = path; + _tmp2_ = path; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, TAG_PATH_SEPARATOR_STRING, 0); + _tmp4_ = _tmp3_ = g_strsplit (_tmp2_, TAG_PATH_SEPARATOR_STRING, 0); #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - raw_components = _tmp5_; + raw_components = _tmp4_; #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - raw_components_length1 = _vala_array_length (_tmp4_); + raw_components_length1 = _vala_array_length (_tmp3_); #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _raw_components_size_ = raw_components_length1; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = raw_components; + _tmp5_ = raw_components; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6__length1 = raw_components_length1; -#line 685 "HierarchicalTagUtilities.c" + _tmp5__length1 = raw_components_length1; +#line 634 "HierarchicalTagUtilities.c" { gchar** component_collection = NULL; gint component_collection_length1 = 0; gint _component_collection_size_ = 0; gint component_it = 0; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component_collection = _tmp6_; + component_collection = _tmp5_; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component_collection_length1 = _tmp6__length1; + component_collection_length1 = _tmp5__length1; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - for (component_it = 0; component_it < _tmp6__length1; component_it = component_it + 1) { -#line 697 "HierarchicalTagUtilities.c" - gchar* _tmp7_; + for (component_it = 0; component_it < _tmp5__length1; component_it = component_it + 1) { +#line 646 "HierarchicalTagUtilities.c" + gchar* _tmp6_; gchar* component = NULL; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = g_strdup (component_collection[component_it]); + _tmp6_ = g_strdup (component_collection[component_it]); #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - component = _tmp7_; -#line 704 "HierarchicalTagUtilities.c" + component = _tmp6_; +#line 653 "HierarchicalTagUtilities.c" { - const gchar* _tmp8_; + const gchar* _tmp7_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = component; + _tmp7_ = component; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (g_strcmp0 (_tmp8_, "") != 0) { -#line 711 "HierarchicalTagUtilities.c" - GeeArrayList* _tmp9_; - const gchar* _tmp10_; + if (g_strcmp0 (_tmp7_, "") != 0) { +#line 660 "HierarchicalTagUtilities.c" + GeeArrayList* _tmp8_; + const gchar* _tmp9_; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = components; + _tmp8_ = components; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = component; + _tmp9_ = component; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 720 "HierarchicalTagUtilities.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); +#line 669 "HierarchicalTagUtilities.c" } #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (component); -#line 724 "HierarchicalTagUtilities.c" +#line 673 "HierarchicalTagUtilities.c" } } } #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = components; + _tmp10_ = components; #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _vala_assert (_tmp13_ > 0, "components.size > 0"); + _vala_assert (_tmp12_ > 0, "components.size > 0"); #line 78 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = G_TYPE_CHECK_INSTANCE_CAST (components, GEE_TYPE_LIST, GeeList); #line 78 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -740,7 +689,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p _g_free0 (path); #line 78 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 744 "HierarchicalTagUtilities.c" +#line 693 "HierarchicalTagUtilities.c" } @@ -749,515 +698,417 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p * For example if 'path_elements' is the list { "Animals", "Mammals", "Elephant" } * the path "/Animals/Mammals/Elephant" will be returned */ -static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { +static gchar* +_vala_g_strjoinv (const gchar* separator, + gchar** str_array, + int str_array_length1) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gchar** _tmp3_; - gint _tmp3__length1; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = separator; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp0_ == NULL) { -#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp0_ = FALSE; +#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (separator == NULL) { +#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" separator = ""; -#line 766 "HierarchicalTagUtilities.c" - } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = TRUE; -#line 776 "HierarchicalTagUtilities.c" - } else { - gchar** _tmp4_; - gint _tmp4__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = _tmp4__length1 > 0; -#line 786 "HierarchicalTagUtilities.c" +#line 713 "HierarchicalTagUtilities.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = TRUE; -#line 792 "HierarchicalTagUtilities.c" - } else { - gboolean _tmp5_ = FALSE; - gchar** _tmp6_; - gint _tmp6__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp6__length1 == -1) { -#line 803 "HierarchicalTagUtilities.c" - gchar** _tmp7_; - gint _tmp7__length1; - const gchar* _tmp8_; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_[0]; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_ != NULL; -#line 815 "HierarchicalTagUtilities.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array != NULL) { +#line 717 "HierarchicalTagUtilities.c" + gboolean _tmp1_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 > 0) { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 723 "HierarchicalTagUtilities.c" } else { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = FALSE; -#line 819 "HierarchicalTagUtilities.c" + gboolean _tmp2_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 728 "HierarchicalTagUtilities.c" + const gchar* _tmp3_; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = str_array[0]; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp3_ != NULL; +#line 734 "HierarchicalTagUtilities.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = FALSE; +#line 738 "HierarchicalTagUtilities.c" + } +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _tmp2_; +#line 742 "HierarchicalTagUtilities.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = _tmp5_; -#line 823 "HierarchicalTagUtilities.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = _tmp1_; +#line 746 "HierarchicalTagUtilities.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = FALSE; +#line 750 "HierarchicalTagUtilities.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_) { -#line 827 "HierarchicalTagUtilities.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 754 "HierarchicalTagUtilities.c" gint i = 0; gsize len = 0UL; - gint _tmp31_; - gint _tmp33_; - gint _tmp34_; - gsize _tmp35_; - const gchar* _tmp36_; - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; + gint _tmp20_; + gint _tmp22_; + gint _tmp23_; + gsize _tmp24_; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; const gchar* res = NULL; - gsize _tmp40_; - void* _tmp41_; + gsize _tmp28_; + void* _tmp29_; void* ptr = NULL; - const gchar* _tmp42_; - gchar** _tmp43_; - gint _tmp43__length1; - const gchar* _tmp44_; - void* _tmp45_; - const gchar* _tmp62_; -#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + const gchar* _tmp30_; + const gchar* _tmp31_; + void* _tmp32_; + const gchar* _tmp45_; +#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 850 "HierarchicalTagUtilities.c" +#line 774 "HierarchicalTagUtilities.c" { - gboolean _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 0; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = TRUE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = TRUE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 859 "HierarchicalTagUtilities.c" - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp21_ = 0; - gchar** _tmp22_; - gint _tmp22__length1; - gint _tmp23_; - const gchar* _tmp24_; - gsize _tmp30_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp9_) { -#line 872 "HierarchicalTagUtilities.c" - gint _tmp10_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp10_ + 1; -#line 878 "HierarchicalTagUtilities.c" +#line 783 "HierarchicalTagUtilities.c" + gboolean _tmp6_ = FALSE; + gboolean _tmp7_ = FALSE; + gint _tmp12_ = 0; + gint _tmp13_; + const gchar* _tmp14_; + gsize _tmp19_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp4_) { +#line 792 "HierarchicalTagUtilities.c" + gint _tmp5_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp5_ + 1; +#line 798 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13__length1 != -1) { -#line 888 "HierarchicalTagUtilities.c" - gint _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ < _tmp15__length1; -#line 900 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 != -1) { +#line 804 "HierarchicalTagUtilities.c" + gint _tmp8_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp8_ < str_array_length1; +#line 810 "HierarchicalTagUtilities.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 904 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = FALSE; +#line 814 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp12_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = TRUE; -#line 910 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp7_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = TRUE; +#line 820 "HierarchicalTagUtilities.c" } else { - gboolean _tmp16_ = FALSE; - gchar** _tmp17_; - gint _tmp17__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp17__length1 == -1) { -#line 921 "HierarchicalTagUtilities.c" - gchar** _tmp18_; - gint _tmp18__length1; - gint _tmp19_; - const gchar* _tmp20_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = _tmp18_[_tmp19_]; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = _tmp20_ != NULL; -#line 936 "HierarchicalTagUtilities.c" + gboolean _tmp9_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 825 "HierarchicalTagUtilities.c" + gint _tmp10_; + const gchar* _tmp11_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp11_ = str_array[_tmp10_]; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = _tmp11_ != NULL; +#line 834 "HierarchicalTagUtilities.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = FALSE; -#line 940 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = FALSE; +#line 838 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp16_; -#line 944 "HierarchicalTagUtilities.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp9_; +#line 842 "HierarchicalTagUtilities.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp11_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp6_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 950 "HierarchicalTagUtilities.c" +#line 848 "HierarchicalTagUtilities.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp23_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp24_ = _tmp22_[_tmp23_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp24_ != NULL) { -#line 962 "HierarchicalTagUtilities.c" - gchar** _tmp25_; - gint _tmp25__length1; - gint _tmp26_; - const gchar* _tmp27_; - gint _tmp28_; - gint _tmp29_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp26_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp27_ = _tmp25_[_tmp26_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp29_ = _tmp28_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = _tmp29_; -#line 983 "HierarchicalTagUtilities.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp13_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp14_ = str_array[_tmp13_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp14_ != NULL) { +#line 856 "HierarchicalTagUtilities.c" + gint _tmp15_; + const gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp15_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp16_ = str_array[_tmp15_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp17_ = strlen ((const gchar*) _tmp16_); +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp18_ = _tmp17_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = _tmp18_; +#line 871 "HierarchicalTagUtilities.c" } else { -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = 0; -#line 987 "HierarchicalTagUtilities.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = 0; +#line 875 "HierarchicalTagUtilities.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp30_ = len; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp30_ + _tmp21_; -#line 993 "HierarchicalTagUtilities.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp19_ = len; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp19_ + _tmp12_; +#line 881 "HierarchicalTagUtilities.c" } } -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp31_ = i; -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp31_ == 0) { -#line 1000 "HierarchicalTagUtilities.c" - gchar* _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp32_ = g_strdup (""); -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp20_ = i; +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp20_ == 0) { +#line 888 "HierarchicalTagUtilities.c" + gchar* _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp21_ = g_strdup (""); +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1008 "HierarchicalTagUtilities.c" +#line 896 "HierarchicalTagUtilities.c" } -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp33_ = i; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - str_array_length1 = _tmp33_; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp34_ = str_array_length1; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp35_ = len; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp36_ = separator; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp38_ = _tmp37_; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp39_ = i; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp40_ = len; -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp41_ = g_malloc (_tmp40_); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - res = _tmp41_; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp42_ = res; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43_ = str_array; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43__length1 = str_array_length1; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp44_ = _tmp43_[0]; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp45_; -#line 1046 "HierarchicalTagUtilities.c" +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp22_ = i; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + str_array_length1 = _tmp22_; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp23_ = str_array_length1; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp24_ = len; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp25_ = strlen ((const gchar*) separator); +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp26_ = _tmp25_; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp27_ = i; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1)); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp28_ = len; +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp29_ = g_malloc (_tmp28_); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + res = _tmp29_; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp30_ = res; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp31_ = str_array[0]; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_); +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp32_; +#line 928 "HierarchicalTagUtilities.c" { - gboolean _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = TRUE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = TRUE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 1055 "HierarchicalTagUtilities.c" - gint _tmp48_; - gchar** _tmp49_; - gint _tmp49__length1; - void* _tmp50_; - const gchar* _tmp51_; - void* _tmp52_; - const gchar* _tmp53_ = NULL; - gchar** _tmp54_; - gint _tmp54__length1; - gint _tmp55_; - const gchar* _tmp56_; - void* _tmp60_; - void* _tmp61_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp46_) { -#line 1071 "HierarchicalTagUtilities.c" - gint _tmp47_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp47_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp47_ + 1; -#line 1077 "HierarchicalTagUtilities.c" +#line 937 "HierarchicalTagUtilities.c" + gint _tmp35_; + void* _tmp36_; + void* _tmp37_; + const gchar* _tmp38_ = NULL; + gint _tmp39_; + const gchar* _tmp40_; + void* _tmp43_; + void* _tmp44_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp33_) { +#line 948 "HierarchicalTagUtilities.c" + gint _tmp34_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp34_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp34_ + 1; +#line 954 "HierarchicalTagUtilities.c" } -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp48_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49_ = str_array; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49__length1 = str_array_length1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!(_tmp48_ < _tmp49__length1)) { -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp35_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!(_tmp35_ < str_array_length1)) { +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 1091 "HierarchicalTagUtilities.c" +#line 964 "HierarchicalTagUtilities.c" } -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp50_ = ptr; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp51_ = separator; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp52_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp55_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp56_ = _tmp54_[_tmp55_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp56_ != NULL) { -#line 1111 "HierarchicalTagUtilities.c" - gchar** _tmp57_; - gint _tmp57__length1; - gint _tmp58_; - const gchar* _tmp59_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp58_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp59_ = _tmp57_[_tmp58_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = (const gchar*) _tmp59_; -#line 1126 "HierarchicalTagUtilities.c" +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp36_ = ptr; +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator); +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp37_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp39_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp40_ = str_array[_tmp39_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp40_ != NULL) { +#line 978 "HierarchicalTagUtilities.c" + gint _tmp41_; + const gchar* _tmp42_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp41_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp42_ = str_array[_tmp41_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = (const gchar*) _tmp42_; +#line 987 "HierarchicalTagUtilities.c" } else { -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = ""; -#line 1130 "HierarchicalTagUtilities.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = ""; +#line 991 "HierarchicalTagUtilities.c" } -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp60_ = ptr; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp61_; -#line 1138 "HierarchicalTagUtilities.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp43_ = ptr; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp44_ = g_stpcpy (_tmp43_, _tmp38_); +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp44_; +#line 999 "HierarchicalTagUtilities.c" } } -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp62_ = res; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp45_ = res; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = NULL; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gchar*) _tmp62_; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gchar*) _tmp45_; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1149 "HierarchicalTagUtilities.c" +#line 1010 "HierarchicalTagUtilities.c" } else { - gchar* _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp63_ = g_strdup (""); -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp46_ = g_strdup (""); +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1158 "HierarchicalTagUtilities.c" +#line 1019 "HierarchicalTagUtilities.c" } } -gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1) { +gchar* +hierarchical_tag_utilities_join_path_components (gchar** path_components, + int path_components_length1) +{ gchar* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; gchar* tmp = NULL; - gchar** _tmp1_; - gint _tmp1__length1; - gchar* _tmp2_; + gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - gchar** _tmp6_; - gchar** _tmp7_; - gint _tmp7__length1; - gchar* _tmp8_; - gchar* _tmp9_; -#line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = path_components; -#line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0__length1 = path_components_length1; + gchar** _tmp4_; + gchar** _tmp5_; + gint _tmp5__length1; + gchar* _tmp6_; + gchar* _tmp7_; #line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp0__length1 <= 0) { + if (path_components_length1 <= 0) { #line 88 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = NULL; #line 88 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1189 "HierarchicalTagUtilities.c" +#line 1045 "HierarchicalTagUtilities.c" } #line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = path_components; -#line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1__length1 = path_components_length1; -#line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, _tmp1_, _tmp1__length1); + _tmp0_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, path_components, path_components_length1); #line 89 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - tmp = _tmp2_; + tmp = _tmp0_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = g_strdup (""); + _tmp1_ = g_strdup (""); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = tmp; + _tmp2_ = tmp; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp3_ = g_strdup (_tmp2_); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = g_new0 (gchar*, 2 + 1); + _tmp4_ = g_new0 (gchar*, 2 + 1); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_[0] = _tmp3_; + _tmp4_[0] = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_[1] = _tmp5_; + _tmp4_[1] = _tmp3_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7__length1 = 2; + _tmp5__length1 = 2; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, _tmp7_, 2); + _tmp6_ = _vala_g_strjoinv (TAG_PATH_SEPARATOR_STRING, _tmp5_, 2); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = (_vala_array_free (_tmp7_, _tmp7__length1, (GDestroyNotify) g_free), NULL); + _tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp9_; + result = _tmp7_; #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (tmp); #line 90 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1227 "HierarchicalTagUtilities.c" +#line 1079 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) { +gchar* +hierarchical_tag_utilities_get_basename (const gchar* in_path) +{ gchar* result = NULL; gchar* path = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; GeeList* components = NULL; - GeeList* _tmp2_; + GeeList* _tmp1_; gchar* basename = NULL; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - gpointer _tmp5_; + gpointer _tmp4_; #line 93 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_path; -#line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp0_); + _tmp0_ = hierarchical_tag_utilities_flat_to_hierarchical (in_path); #line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp1_; + path = _tmp0_; #line 96 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = hierarchical_tag_utilities_enumerate_path_components (path); + _tmp1_ = hierarchical_tag_utilities_enumerate_path_components (path); #line 96 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - components = _tmp2_; + components = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (components, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (components, GEE_TYPE_COLLECTION, GeeCollection)); #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = gee_list_get (components, _tmp4_ - 1); + _tmp4_ = gee_list_get (components, _tmp3_ - 1); #line 98 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - basename = (gchar*) _tmp5_; + basename = (gchar*) _tmp4_; #line 100 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = basename; #line 100 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1266,348 +1117,326 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) { _g_free0 (path); #line 100 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1270 "HierarchicalTagUtilities.c" +#line 1121 "HierarchicalTagUtilities.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 1289 "HierarchicalTagUtilities.c" +#line 1144 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 1296 "HierarchicalTagUtilities.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 1148 "HierarchicalTagUtilities.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 1302 "HierarchicalTagUtilities.c" +#line 1154 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 1312 "HierarchicalTagUtilities.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 1158 "HierarchicalTagUtilities.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 1316 "HierarchicalTagUtilities.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1162 "HierarchicalTagUtilities.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1324 "HierarchicalTagUtilities.c" +#line 1170 "HierarchicalTagUtilities.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1356 "HierarchicalTagUtilities.c" +#line 1198 "HierarchicalTagUtilities.c" goto __catch63_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1365 "HierarchicalTagUtilities.c" +#line 1207 "HierarchicalTagUtilities.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1381 "HierarchicalTagUtilities.c" +#line 1221 "HierarchicalTagUtilities.c" goto __catch63_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1392 "HierarchicalTagUtilities.c" +#line 1232 "HierarchicalTagUtilities.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1406 "HierarchicalTagUtilities.c" +#line 1246 "HierarchicalTagUtilities.c" } goto __finally63; __catch63_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 1420 "HierarchicalTagUtilities.c" +#line 1260 "HierarchicalTagUtilities.c" } __finally63: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 1431 "HierarchicalTagUtilities.c" +#line 1271 "HierarchicalTagUtilities.c" } } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1450 "HierarchicalTagUtilities.c" +#line 1290 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator) { +gchar* +hierarchical_tag_utilities_canonicalize (const gchar* in_tag, + const gchar* foreign_separator) +{ gchar* result = NULL; gchar* _result_ = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; const gchar* _tmp1_; - gchar* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; gboolean is_valid = FALSE; - const gchar* _tmp17_ = NULL; - gboolean _tmp18_; - gchar* _tmp20_; + const gchar* _tmp12_ = NULL; + gboolean _tmp13_; + gchar* _tmp15_; #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_tag != NULL, NULL); #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (foreign_separator != NULL, NULL); #line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_tag; -#line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = foreign_separator; -#line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = string_replace (_tmp0_, _tmp1_, TAG_PATH_SEPARATOR_STRING); + _tmp0_ = string_replace (in_tag, foreign_separator, TAG_PATH_SEPARATOR_STRING); #line 104 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _result_ = _tmp2_; + _result_ = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = _result_; + _tmp1_ = _result_; #line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING); -#line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp4_) { -#line 1484 "HierarchicalTagUtilities.c" - const gchar* _tmp5_; - gchar* _tmp6_; + if (!g_str_has_prefix (_tmp1_, TAG_PATH_SEPARATOR_STRING)) { +#line 1318 "HierarchicalTagUtilities.c" + const gchar* _tmp2_; + gchar* _tmp3_; #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _result_; + _tmp2_ = _result_; #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp5_, NULL); + _tmp3_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp2_, NULL); #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (_result_); #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _result_ = _tmp6_; -#line 1495 "HierarchicalTagUtilities.c" + _result_ = _tmp3_; +#line 1329 "HierarchicalTagUtilities.c" } #line 110 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" is_valid = FALSE; -#line 1499 "HierarchicalTagUtilities.c" +#line 1333 "HierarchicalTagUtilities.c" { gint i = 0; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = 0; -#line 1504 "HierarchicalTagUtilities.c" +#line 1338 "HierarchicalTagUtilities.c" { - gboolean _tmp7_ = FALSE; + gboolean _tmp4_ = FALSE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = TRUE; + _tmp4_ = TRUE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1511 "HierarchicalTagUtilities.c" +#line 1345 "HierarchicalTagUtilities.c" + gint _tmp6_; + const gchar* _tmp7_; + gint _tmp8_; gint _tmp9_; const gchar* _tmp10_; gint _tmp11_; - gint _tmp12_; - const gchar* _tmp13_; - gint _tmp14_; - gchar _tmp15_; - gchar _tmp16_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp7_) { -#line 1522 "HierarchicalTagUtilities.c" - gint _tmp8_; + if (!_tmp4_) { +#line 1354 "HierarchicalTagUtilities.c" + gint _tmp5_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = i; + _tmp5_ = i; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - i = _tmp8_ + 1; -#line 1528 "HierarchicalTagUtilities.c" + i = _tmp5_ + 1; +#line 1360 "HierarchicalTagUtilities.c" } #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = FALSE; + _tmp4_ = FALSE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = i; + _tmp6_ = i; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = _result_; + _tmp7_ = _result_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = strlen (_tmp10_); + _tmp8_ = strlen (_tmp7_); #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = _tmp11_; + _tmp9_ = _tmp8_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!(_tmp9_ < _tmp12_)) { + if (!(_tmp6_ < _tmp9_)) { #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1544 "HierarchicalTagUtilities.c" +#line 1376 "HierarchicalTagUtilities.c" } #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _result_; -#line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = i; -#line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = string_get (_tmp13_, (glong) _tmp14_); + _tmp10_ = _result_; #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = string_get (TAG_PATH_SEPARATOR_STRING, (glong) 0); + _tmp11_ = i; #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp15_ != _tmp16_) { + if (string_get (_tmp10_, (glong) _tmp11_) != string_get (TAG_PATH_SEPARATOR_STRING, (glong) 0)) { #line 113 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" is_valid = TRUE; #line 114 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1560 "HierarchicalTagUtilities.c" +#line 1388 "HierarchicalTagUtilities.c" } } } } #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = is_valid; + _tmp13_ = is_valid; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp18_) { -#line 1569 "HierarchicalTagUtilities.c" - const gchar* _tmp19_; + if (_tmp13_) { +#line 1397 "HierarchicalTagUtilities.c" + const gchar* _tmp14_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = _result_; + _tmp14_ = _result_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = _tmp19_; -#line 1575 "HierarchicalTagUtilities.c" + _tmp12_ = _tmp14_; +#line 1403 "HierarchicalTagUtilities.c" } else { #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = NULL; -#line 1579 "HierarchicalTagUtilities.c" + _tmp12_ = NULL; +#line 1407 "HierarchicalTagUtilities.c" } #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = g_strdup (_tmp17_); + _tmp15_ = g_strdup (_tmp12_); #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp20_; + result = _tmp15_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (_result_); #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1589 "HierarchicalTagUtilities.c" +#line 1417 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) { +gchar* +hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_tag != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = in_tag; -#line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = string_replace (_tmp0_, TAG_PATH_SEPARATOR_STRING, "-"); + _tmp0_ = string_replace (in_tag, TAG_PATH_SEPARATOR_STRING, "-"); #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp1_; + result = _tmp0_; #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1607 "HierarchicalTagUtilities.c" +#line 1434 "HierarchicalTagUtilities.c" } -HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords) { +HierarchicalTagIndex* +hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords) +{ HierarchicalTagIndex* result = NULL; HierarchicalTagIndex* index = NULL; HierarchicalTagIndex* _tmp0_; @@ -1617,607 +1446,601 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key _tmp0_ = hierarchical_tag_index_new (); #line 126 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" index = _tmp0_; -#line 1621 "HierarchicalTagUtilities.c" +#line 1450 "HierarchicalTagUtilities.c" { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = h_keywords; + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (h_keywords, GEE_TYPE_ITERABLE, GeeIterable)); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _keyword_it = _tmp2_; + _keyword_it = _tmp1_; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1634 "HierarchicalTagUtilities.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1460 "HierarchicalTagUtilities.c" + GeeIterator* _tmp2_; gchar* keyword = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; GeeList* parent_paths = NULL; + const gchar* _tmp5_; + GeeList* _tmp6_; + GeeList* path_components = NULL; const gchar* _tmp7_; GeeList* _tmp8_; - GeeList* path_components = NULL; - const gchar* _tmp9_; - GeeList* _tmp10_; - GeeList* _tmp11_; - gint _tmp12_; + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; + GeeList* _tmp12_; gint _tmp13_; - GeeList* _tmp14_; - gint _tmp15_; - gint _tmp16_; - HierarchicalTagIndex* _tmp39_; + gint _tmp14_; + HierarchicalTagIndex* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; const gchar* _tmp40_; - gchar* _tmp41_; - gchar* _tmp42_; - const gchar* _tmp43_; -#line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = _keyword_it; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _keyword_it; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1665 "HierarchicalTagUtilities.c" +#line 1488 "HierarchicalTagUtilities.c" } #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _keyword_it; + _tmp3_ = _keyword_it; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - keyword = (gchar*) _tmp6_; + keyword = (gchar*) _tmp4_; #line 129 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = keyword; + _tmp5_ = keyword; #line 129 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp7_); + _tmp6_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp5_); #line 129 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - parent_paths = _tmp8_; + parent_paths = _tmp6_; #line 131 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = keyword; + _tmp7_ = keyword; #line 131 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = hierarchical_tag_utilities_enumerate_path_components (_tmp9_); + _tmp8_ = hierarchical_tag_utilities_enumerate_path_components (_tmp7_); #line 131 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path_components = _tmp10_; + path_components = _tmp8_; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = parent_paths; + _tmp9_ = parent_paths; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _tmp12_; + _tmp11_ = _tmp10_; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = path_components; + _tmp12_ = path_components; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = _tmp15_; + _tmp14_ = _tmp13_; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _vala_assert (_tmp13_ <= _tmp16_, "parent_paths.size <= path_components.size"); -#line 1699 "HierarchicalTagUtilities.c" + _vala_assert (_tmp11_ <= _tmp14_, "parent_paths.size <= path_components.size"); +#line 1522 "HierarchicalTagUtilities.c" { gint i = 0; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = 0; -#line 1704 "HierarchicalTagUtilities.c" +#line 1527 "HierarchicalTagUtilities.c" { - gboolean _tmp17_ = FALSE; + gboolean _tmp15_ = FALSE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = TRUE; + _tmp15_ = TRUE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1711 "HierarchicalTagUtilities.c" +#line 1534 "HierarchicalTagUtilities.c" + gint _tmp17_; + GeeList* _tmp18_; gint _tmp19_; - GeeList* _tmp20_; - gint _tmp21_; - gint _tmp22_; - HierarchicalTagIndex* _tmp23_; - GeeList* _tmp24_; - gint _tmp25_; - gpointer _tmp26_; - gchar* _tmp27_; - gboolean _tmp28_; - gboolean _tmp29_; + gint _tmp20_; + HierarchicalTagIndex* _tmp21_; + GeeList* _tmp22_; + gint _tmp23_; + gpointer _tmp24_; + gchar* _tmp25_; + gboolean _tmp26_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp17_) { -#line 1725 "HierarchicalTagUtilities.c" - gint _tmp18_; + if (!_tmp15_) { +#line 1547 "HierarchicalTagUtilities.c" + gint _tmp16_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = i; + _tmp16_ = i; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - i = _tmp18_ + 1; -#line 1731 "HierarchicalTagUtilities.c" + i = _tmp16_ + 1; +#line 1553 "HierarchicalTagUtilities.c" } #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = FALSE; + _tmp15_ = FALSE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = i; + _tmp17_ = i; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = parent_paths; + _tmp18_ = parent_paths; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp22_ = _tmp21_; + _tmp20_ = _tmp19_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!(_tmp19_ < _tmp22_)) { + if (!(_tmp17_ < _tmp20_)) { #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1747 "HierarchicalTagUtilities.c" +#line 1569 "HierarchicalTagUtilities.c" } #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp23_ = index; -#line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp24_ = path_components; + _tmp21_ = index; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp25_ = i; + _tmp22_ = path_components; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp26_ = gee_list_get (_tmp24_, _tmp25_); + _tmp23_ = i; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp27_ = (gchar*) _tmp26_; + _tmp24_ = gee_list_get (_tmp22_, _tmp23_); #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp28_ = hierarchical_tag_index_is_path_known (_tmp23_, _tmp27_); + _tmp25_ = (gchar*) _tmp24_; #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp29_ = !_tmp28_; + _tmp26_ = !hierarchical_tag_index_is_path_known (_tmp21_, _tmp25_); #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp25_); #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp29_) { -#line 1767 "HierarchicalTagUtilities.c" - HierarchicalTagIndex* _tmp30_; - GeeList* _tmp31_; - gint _tmp32_; - gpointer _tmp33_; - gchar* _tmp34_; - GeeList* _tmp35_; - gint _tmp36_; - gpointer _tmp37_; - gchar* _tmp38_; + if (_tmp26_) { +#line 1587 "HierarchicalTagUtilities.c" + HierarchicalTagIndex* _tmp27_; + GeeList* _tmp28_; + gint _tmp29_; + gpointer _tmp30_; + gchar* _tmp31_; + GeeList* _tmp32_; + gint _tmp33_; + gpointer _tmp34_; + gchar* _tmp35_; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp30_ = index; + _tmp27_ = index; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp31_ = path_components; + _tmp28_ = path_components; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp32_ = i; + _tmp29_ = i; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp33_ = gee_list_get (_tmp31_, _tmp32_); + _tmp30_ = gee_list_get (_tmp28_, _tmp29_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp34_ = (gchar*) _tmp33_; + _tmp31_ = (gchar*) _tmp30_; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp35_ = parent_paths; + _tmp32_ = parent_paths; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp36_ = i; + _tmp33_ = i; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp37_ = gee_list_get (_tmp35_, _tmp36_); + _tmp34_ = gee_list_get (_tmp32_, _tmp33_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp38_ = (gchar*) _tmp37_; + _tmp35_ = (gchar*) _tmp34_; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - hierarchical_tag_index_add_path (_tmp30_, _tmp34_, _tmp38_); + hierarchical_tag_index_add_path (_tmp27_, _tmp31_, _tmp35_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp35_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp34_); -#line 1801 "HierarchicalTagUtilities.c" + _g_free0 (_tmp31_); +#line 1621 "HierarchicalTagUtilities.c" } } } } #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp39_ = index; + _tmp36_ = index; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp40_ = keyword; + _tmp37_ = keyword; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp41_ = hierarchical_tag_utilities_get_basename (_tmp40_); + _tmp38_ = hierarchical_tag_utilities_get_basename (_tmp37_); #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp42_ = _tmp41_; + _tmp39_ = _tmp38_; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp43_ = keyword; + _tmp40_ = keyword; #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - hierarchical_tag_index_add_path (_tmp39_, _tmp42_, _tmp43_); + hierarchical_tag_index_add_path (_tmp36_, _tmp39_, _tmp40_); #line 141 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp39_); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (path_components); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (parent_paths); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (keyword); -#line 1826 "HierarchicalTagUtilities.c" +#line 1646 "HierarchicalTagUtilities.c" } #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (_keyword_it); -#line 1830 "HierarchicalTagUtilities.c" +#line 1650 "HierarchicalTagUtilities.c" } #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = index; #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1836 "HierarchicalTagUtilities.c" +#line 1656 "HierarchicalTagUtilities.c" } -gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) { +gchar* +hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) +{ gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - GeeList* _tmp2_; - GeeList* _tmp3_; - gint _tmp4_; - gint _tmp5_; - gboolean _tmp6_; + GeeList* _tmp0_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gboolean _tmp4_; gchar* path = NULL; - const gchar* _tmp9_; - gchar* _tmp10_; - TagSourceCollection* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - const gchar* _tmp20_ = NULL; - TagSourceCollection* _tmp21_; - const gchar* _tmp22_; - gboolean _tmp23_; - gchar* _tmp25_; -#line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = client_path; + gchar* _tmp6_; + TagSourceCollection* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp14_ = NULL; + TagSourceCollection* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp18_; #line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp0_ == NULL) { + if (client_path == NULL) { #line 149 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = NULL; #line 149 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1868 "HierarchicalTagUtilities.c" +#line 1683 "HierarchicalTagUtilities.c" } #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = client_path; + _tmp0_ = hierarchical_tag_utilities_enumerate_parent_paths (client_path); #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp1_); + _tmp1_ = _tmp0_; #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = _tmp2_; -#line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = _tmp5_ != 0; + _tmp4_ = _tmp3_ != 0; #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp6_) { -#line 1886 "HierarchicalTagUtilities.c" - const gchar* _tmp7_; - gchar* _tmp8_; -#line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = client_path; + if (_tmp4_) { +#line 1699 "HierarchicalTagUtilities.c" + gchar* _tmp5_; #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp5_ = g_strdup (client_path); #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp8_; + result = _tmp5_; #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1897 "HierarchicalTagUtilities.c" +#line 1707 "HierarchicalTagUtilities.c" } #line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = client_path; -#line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp6_ = g_strdup (client_path); #line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp10_; + path = _tmp6_; #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = tag_global; + _tmp7_ = tag_global; #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = path; + _tmp8_ = path; #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = tag_source_collection_exists (_tmp11_, _tmp12_, FALSE); -#line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (!_tmp13_) { -#line 1913 "HierarchicalTagUtilities.c" - const gchar* _tmp14_; - gboolean _tmp15_; -#line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = path; + if (!tag_source_collection_exists (_tmp7_, _tmp8_, FALSE)) { +#line 1719 "HierarchicalTagUtilities.c" + const gchar* _tmp9_; #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING); + _tmp9_ = path; #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp15_) { -#line 1922 "HierarchicalTagUtilities.c" - const gchar* _tmp16_; - gchar* _tmp17_; + if (g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING)) { +#line 1725 "HierarchicalTagUtilities.c" + const gchar* _tmp10_; + gchar* _tmp11_; #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = path; + _tmp10_ = path; #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp16_); + _tmp11_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp10_); #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (path); #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp17_; -#line 1933 "HierarchicalTagUtilities.c" + path = _tmp11_; +#line 1736 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp12_; + gchar* _tmp13_; #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = path; + _tmp12_ = path; #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp18_); + _tmp13_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp12_); #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (path); #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - path = _tmp19_; -#line 1945 "HierarchicalTagUtilities.c" + path = _tmp13_; +#line 1748 "HierarchicalTagUtilities.c" } } #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp21_ = tag_global; + _tmp15_ = tag_global; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp22_ = path; + _tmp16_ = path; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp23_ = tag_source_collection_exists (_tmp21_, _tmp22_, FALSE); + if (tag_source_collection_exists (_tmp15_, _tmp16_, FALSE)) { +#line 1757 "HierarchicalTagUtilities.c" + const gchar* _tmp17_; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp23_) { -#line 1956 "HierarchicalTagUtilities.c" - const gchar* _tmp24_; + _tmp17_ = path; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp24_ = path; -#line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = _tmp24_; -#line 1962 "HierarchicalTagUtilities.c" + _tmp14_ = _tmp17_; +#line 1763 "HierarchicalTagUtilities.c" } else { #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = NULL; -#line 1966 "HierarchicalTagUtilities.c" + _tmp14_ = NULL; +#line 1767 "HierarchicalTagUtilities.c" } #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp25_ = g_strdup (_tmp20_); + _tmp18_ = g_strdup (_tmp14_); #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - result = _tmp25_; + result = _tmp18_; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (path); #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1976 "HierarchicalTagUtilities.c" +#line 1777 "HierarchicalTagUtilities.c" } -void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { +void +hierarchical_tag_utilities_cleanup_root_path (const gchar* path) +{ GeeList* paths = NULL; - const gchar* _tmp0_; + GeeList* _tmp0_; GeeList* _tmp1_; - GeeList* _tmp2_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (path != NULL); #line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp0_ = path; + _tmp0_ = hierarchical_tag_utilities_enumerate_parent_paths (path); #line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp1_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp0_); -#line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - paths = _tmp1_; + paths = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp2_ = paths; + _tmp1_ = paths; #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp4_ == 0) { -#line 2003 "HierarchicalTagUtilities.c" + if (_tmp3_ == 0) { +#line 1803 "HierarchicalTagUtilities.c" gchar* actual_path = NULL; + gchar* _tmp4_; const gchar* _tmp5_; - gchar* _tmp6_; - const gchar* _tmp7_; Tag* t = NULL; - TagSourceCollection* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - gboolean _tmp13_ = FALSE; - Tag* _tmp14_; -#line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp5_ = path; + TagSourceCollection* _tmp6_; + const gchar* _tmp7_; + gboolean _tmp10_ = FALSE; + Tag* _tmp11_; #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp6_ = hierarchical_tag_utilities_get_root_path_form (_tmp5_); + _tmp4_ = hierarchical_tag_utilities_get_root_path_form (path); #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - actual_path = _tmp6_; + actual_path = _tmp4_; #line 172 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp7_ = actual_path; + _tmp5_ = actual_path; #line 172 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp7_ == NULL) { + if (_tmp5_ == NULL) { #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (actual_path); #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (paths); #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return; -#line 2030 "HierarchicalTagUtilities.c" +#line 1826 "HierarchicalTagUtilities.c" } #line 175 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" t = NULL; #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp8_ = tag_global; -#line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp9_ = actual_path; + _tmp6_ = tag_global; #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE); + _tmp7_ = actual_path; #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp10_) { -#line 2042 "HierarchicalTagUtilities.c" - const gchar* _tmp11_; - Tag* _tmp12_; + if (tag_source_collection_exists (_tmp6_, _tmp7_, FALSE)) { +#line 1836 "HierarchicalTagUtilities.c" + const gchar* _tmp8_; + Tag* _tmp9_; #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp11_ = actual_path; + _tmp8_ = actual_path; #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp12_ = tag_for_path (_tmp11_); + _tmp9_ = tag_for_path (_tmp8_); #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (t); #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - t = _tmp12_; -#line 2053 "HierarchicalTagUtilities.c" + t = _tmp9_; +#line 1847 "HierarchicalTagUtilities.c" } #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp14_ = t; + _tmp11_ = t; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp14_ != NULL) { -#line 2059 "HierarchicalTagUtilities.c" - Tag* _tmp15_; - GeeList* _tmp16_; - GeeList* _tmp17_; - gint _tmp18_; - gint _tmp19_; + if (_tmp11_ != NULL) { +#line 1853 "HierarchicalTagUtilities.c" + Tag* _tmp12_; + GeeList* _tmp13_; + GeeList* _tmp14_; + gint _tmp15_; + gint _tmp16_; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp15_ = t; + _tmp12_ = t; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp16_ = tag_get_hierarchical_children (_tmp15_); + _tmp13_ = tag_get_hierarchical_children (_tmp12_); #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = _tmp19_ == 0; + _tmp10_ = _tmp16_ == 0; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _g_object_unref0 (_tmp17_); -#line 2079 "HierarchicalTagUtilities.c" + _g_object_unref0 (_tmp14_); +#line 1873 "HierarchicalTagUtilities.c" } else { #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp13_ = FALSE; -#line 2083 "HierarchicalTagUtilities.c" + _tmp10_ = FALSE; +#line 1877 "HierarchicalTagUtilities.c" } #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - if (_tmp13_) { -#line 2087 "HierarchicalTagUtilities.c" - Tag* _tmp20_; + if (_tmp10_) { +#line 1881 "HierarchicalTagUtilities.c" + Tag* _tmp17_; #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - _tmp20_ = t; + _tmp17_ = t; #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" - tag_flatten (_tmp20_); -#line 2093 "HierarchicalTagUtilities.c" + tag_flatten (_tmp17_); +#line 1887 "HierarchicalTagUtilities.c" } #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (t); #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (actual_path); -#line 2099 "HierarchicalTagUtilities.c" +#line 1893 "HierarchicalTagUtilities.c" } #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (paths); -#line 2103 "HierarchicalTagUtilities.c" +#line 1897 "HierarchicalTagUtilities.c" } -HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_type) { +HierarchicalTagUtilities* +hierarchical_tag_utilities_construct (GType object_type) +{ HierarchicalTagUtilities* self = NULL; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self = (HierarchicalTagUtilities*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return self; -#line 2113 "HierarchicalTagUtilities.c" +#line 1909 "HierarchicalTagUtilities.c" } -HierarchicalTagUtilities* hierarchical_tag_utilities_new (void) { +HierarchicalTagUtilities* +hierarchical_tag_utilities_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return hierarchical_tag_utilities_construct (TYPE_HIERARCHICAL_TAG_UTILITIES); -#line 2120 "HierarchicalTagUtilities.c" +#line 1918 "HierarchicalTagUtilities.c" } -static void value_hierarchical_tag_utilities_init (GValue* value) { +static void +value_hierarchical_tag_utilities_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2127 "HierarchicalTagUtilities.c" +#line 1927 "HierarchicalTagUtilities.c" } -static void value_hierarchical_tag_utilities_free_value (GValue* value) { +static void +value_hierarchical_tag_utilities_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (value->data[0].v_pointer); -#line 2136 "HierarchicalTagUtilities.c" +#line 1938 "HierarchicalTagUtilities.c" } } -static void value_hierarchical_tag_utilities_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_hierarchical_tag_utilities_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" dest_value->data[0].v_pointer = hierarchical_tag_utilities_ref (src_value->data[0].v_pointer); -#line 2146 "HierarchicalTagUtilities.c" +#line 1951 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" dest_value->data[0].v_pointer = NULL; -#line 2150 "HierarchicalTagUtilities.c" +#line 1955 "HierarchicalTagUtilities.c" } } -static gpointer value_hierarchical_tag_utilities_peek_pointer (const GValue* value) { +static gpointer +value_hierarchical_tag_utilities_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return value->data[0].v_pointer; -#line 2158 "HierarchicalTagUtilities.c" +#line 1965 "HierarchicalTagUtilities.c" } -static gchar* value_hierarchical_tag_utilities_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_utilities_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (collect_values[0].v_pointer) { -#line 2165 "HierarchicalTagUtilities.c" +#line 1977 "HierarchicalTagUtilities.c" HierarchicalTagUtilities * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2172 "HierarchicalTagUtilities.c" +#line 1984 "HierarchicalTagUtilities.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.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 2176 "HierarchicalTagUtilities.c" +#line 1988 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = hierarchical_tag_utilities_ref (object); -#line 2180 "HierarchicalTagUtilities.c" +#line 1992 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2184 "HierarchicalTagUtilities.c" +#line 1996 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return NULL; -#line 2188 "HierarchicalTagUtilities.c" +#line 2000 "HierarchicalTagUtilities.c" } -static gchar* value_hierarchical_tag_utilities_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_tag_utilities_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ HierarchicalTagUtilities ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2199 "HierarchicalTagUtilities.c" +#line 2016 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = NULL; -#line 2205 "HierarchicalTagUtilities.c" +#line 2022 "HierarchicalTagUtilities.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = value->data[0].v_pointer; -#line 2209 "HierarchicalTagUtilities.c" +#line 2026 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = hierarchical_tag_utilities_ref (value->data[0].v_pointer); -#line 2213 "HierarchicalTagUtilities.c" +#line 2030 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return NULL; -#line 2217 "HierarchicalTagUtilities.c" +#line 2034 "HierarchicalTagUtilities.c" } -GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_hierarchical_tag_utilities (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecHierarchicalTagUtilities* spec; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_HIERARCHICAL_TAG_UTILITIES), NULL); @@ -2227,20 +2050,25 @@ GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return G_PARAM_SPEC (spec); -#line 2231 "HierarchicalTagUtilities.c" +#line 2054 "HierarchicalTagUtilities.c" } -gpointer value_get_hierarchical_tag_utilities (const GValue* value) { +gpointer +value_get_hierarchical_tag_utilities (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES), NULL); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return value->data[0].v_pointer; -#line 2240 "HierarchicalTagUtilities.c" +#line 2065 "HierarchicalTagUtilities.c" } -void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) { +void +value_set_hierarchical_tag_utilities (GValue* value, + gpointer v_object) +{ HierarchicalTagUtilities * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES)); @@ -2256,22 +2084,25 @@ void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_ref (value->data[0].v_pointer); -#line 2260 "HierarchicalTagUtilities.c" +#line 2088 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2264 "HierarchicalTagUtilities.c" +#line 2092 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (old); -#line 2270 "HierarchicalTagUtilities.c" +#line 2098 "HierarchicalTagUtilities.c" } } -void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object) { +void +value_take_hierarchical_tag_utilities (GValue* value, + gpointer v_object) +{ HierarchicalTagUtilities * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES)); @@ -2285,48 +2116,56 @@ void value_take_hierarchical_tag_utilities (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/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = v_object; -#line 2289 "HierarchicalTagUtilities.c" +#line 2120 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2293 "HierarchicalTagUtilities.c" +#line 2124 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (old); -#line 2299 "HierarchicalTagUtilities.c" +#line 2130 "HierarchicalTagUtilities.c" } } -static void hierarchical_tag_utilities_class_init (HierarchicalTagUtilitiesClass * klass) { +static void +hierarchical_tag_utilities_class_init (HierarchicalTagUtilitiesClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" ((HierarchicalTagUtilitiesClass *) klass)->finalize = hierarchical_tag_utilities_finalize; -#line 2309 "HierarchicalTagUtilities.c" +#line 2142 "HierarchicalTagUtilities.c" } -static void hierarchical_tag_utilities_instance_init (HierarchicalTagUtilities * self) { +static void +hierarchical_tag_utilities_instance_init (HierarchicalTagUtilities * self) +{ #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self->ref_count = 1; -#line 2316 "HierarchicalTagUtilities.c" +#line 2151 "HierarchicalTagUtilities.c" } -static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj) { +static void +hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj) +{ HierarchicalTagUtilities * self; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_UTILITIES, HierarchicalTagUtilities); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_signal_handlers_destroy (self); -#line 2326 "HierarchicalTagUtilities.c" +#line 2163 "HierarchicalTagUtilities.c" } -GType hierarchical_tag_utilities_get_type (void) { +GType +hierarchical_tag_utilities_get_type (void) +{ static volatile gsize hierarchical_tag_utilities_type_id__volatile = 0; if (g_once_init_enter (&hierarchical_tag_utilities_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_hierarchical_tag_utilities_init, value_hierarchical_tag_utilities_free_value, value_hierarchical_tag_utilities_copy_value, value_hierarchical_tag_utilities_peek_pointer, "p", value_hierarchical_tag_utilities_collect_value, "p", value_hierarchical_tag_utilities_lcopy_value }; @@ -2340,18 +2179,22 @@ GType hierarchical_tag_utilities_get_type (void) { } -gpointer hierarchical_tag_utilities_ref (gpointer instance) { +gpointer +hierarchical_tag_utilities_ref (gpointer instance) +{ HierarchicalTagUtilities * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return instance; -#line 2351 "HierarchicalTagUtilities.c" +#line 2192 "HierarchicalTagUtilities.c" } -void hierarchical_tag_utilities_unref (gpointer instance) { +void +hierarchical_tag_utilities_unref (gpointer instance) +{ HierarchicalTagUtilities * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -2360,12 +2203,16 @@ void hierarchical_tag_utilities_unref (gpointer instance) { HIERARCHICAL_TAG_UTILITIES_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2364 "HierarchicalTagUtilities.c" +#line 2207 "HierarchicalTagUtilities.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -2377,13 +2224,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c index efc0340..fa5f9eb 100644 --- a/src/tags/TagPage.c +++ b/src/tags/TagPage.c @@ -1,4 +1,4 @@ -/* TagPage.c generated by valac 0.36.6, the Vala compiler +/* TagPage.c generated by valac 0.40.4, the Vala compiler * generated from TagPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -210,6 +211,11 @@ typedef struct _TagPagePrivate TagPagePrivate; typedef struct _Tag Tag; typedef struct _TagClass TagClass; +enum { + TAG_PAGE_0_PROPERTY, + TAG_PAGE_NUM_PROPERTIES +}; +static GParamSpec* tag_page_properties[TAG_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -592,9 +598,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -608,17 +620,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -630,14 +654,17 @@ GType collection_page_get_type (void) G_GNUC_CONST; GType tag_page_get_type (void) G_GNUC_CONST; GType tag_get_type (void) G_GNUC_CONST; #define TAG_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TAG_PAGE, TagPagePrivate)) -enum { - TAG_PAGE_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; @@ -649,223 +676,311 @@ GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void tag_page_on_tags_altered (TagPage* self, GeeMap* map); -static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void tag_page_on_tags_altered (TagPage* self, + GeeMap* map); +static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void tag_page_on_delete_tag (TagPage* self); -static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void tag_page_on_rename_tag (TagPage* self); -static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void tag_page_on_remove_tag_from_photos (TagPage* self); -static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void tag_page_on_new_child_tag_sidebar (TagPage* self); -static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); TagPage* tag_page_new (Tag* tag); -TagPage* tag_page_construct (GType object_type, Tag* tag); +TagPage* tag_page_construct (GType object_type, + Tag* tag); gchar* data_object_get_name (DataObject* self); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); -void tag_mirror_sources (Tag* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target); -DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source); -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); -static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); +void tag_mirror_sources (Tag* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target); +DataView* media_page_create_thumbnail (MediaPage* self, + DataSource* source); +static DataView* _media_page_create_thumbnail_create_view (DataSource* source, + gpointer self); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); +static void tag_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); Tag* tag_page_get_tag (TagPage* self); -static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +static void tag_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -static void tag_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void tag_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -void page_set_page_name (Page* self, const gchar* page_name); -void page_update_actions (Page* self, gint selected_count, gint count); +void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void tag_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +static void tag_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void tag_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +void page_set_page_name (Page* self, + const gchar* page_name); +void page_update_actions (Page* self, + gint selected_count, + gint count); gint view_collection_get_selected_count (ViewCollection* self); gint data_collection_get_count (DataCollection* self); static void tag_page_real_switched_to (Page* base); void page_switched_to (Page* self); -void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label); +void page_update_menu_item_label (Page* self, + const gchar* id, + const gchar* new_label); gchar* resources_delete_tag_menu (const gchar* name); gchar* tag_get_user_visible_name (Tag* self); gchar* resources_rename_tag_menu (const gchar* name); -gchar* resources_untag_photos_menu (const gchar* name, gint count); -static void tag_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive); +gchar* resources_untag_photos_menu (const gchar* name, + gint count); +static void tag_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_details (Page* self, + const gchar* name, + const gchar* label, + const gchar* tooltip, + gboolean sensitive); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType new_child_tag_command_get_type (void) G_GNUC_CONST; NewChildTagCommand* new_child_tag_command_new (Tag* tag); -NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag); +NewChildTagCommand* new_child_tag_command_construct (GType object_type, + Tag* tag); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag); +void library_window_rename_tag_in_sidebar (LibraryWindow* self, + Tag* tag); Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self); gboolean dialogs_confirm_delete_tag (Tag* tag); DeleteTagCommand* delete_tag_command_new (Tag* tag); -DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag); +DeleteTagCommand* delete_tag_command_construct (GType object_type, + Tag* tag); GType delete_tag_command_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); GeeList* view_collection_get_selected_sources (ViewCollection* self); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach); -TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach); +TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); +TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, + Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; static void tag_page_finalize (GObject * obj); static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_delete_tag_gsimple_action_activate_callback}, {"RenameTag", _tag_page_on_rename_tag_gsimple_action_activate_callback}, {"RemoveTagFromPhotos", _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback}, {"NewChildTagSidebar", _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback}}; -static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 23 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_tags_altered ((TagPage*) self, items); -#line 741 "TagPage.c" +#line 840 "TagPage.c" } -static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_delete_tag ((TagPage*) self); -#line 748 "TagPage.c" +#line 851 "TagPage.c" } -static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_rename_tag ((TagPage*) self); -#line 755 "TagPage.c" +#line 862 "TagPage.c" } -static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_remove_tag_from_photos ((TagPage*) self); -#line 762 "TagPage.c" +#line 873 "TagPage.c" } -static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_new_child_tag_sidebar ((TagPage*) self); -#line 769 "TagPage.c" +#line 884 "TagPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self ? g_object_ref (self) : NULL; -#line 776 "TagPage.c" +#line 893 "TagPage.c" } -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self) { +static DataView* +_media_page_create_thumbnail_create_view (DataSource* source, + gpointer self) +{ DataView* result; result = media_page_create_thumbnail ((MediaPage*) self, source); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 785 "TagPage.c" +#line 905 "TagPage.c" } -TagPage* tag_page_construct (GType object_type, Tag* tag) { +TagPage* +tag_page_construct (GType object_type, + Tag* tag) +{ TagPage * self = NULL; - Tag* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - Tag* _tmp3_; - Tag* _tmp4_; - TagSourceCollection* _tmp5_; - Tag* _tmp6_; - ViewCollection* _tmp7_; - ViewCollection* _tmp8_; + Tag* _tmp2_; + TagSourceCollection* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = tag; + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (tag, TYPE_DATA_OBJECT, DataObject)); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); -#line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - self = (TagPage*) collection_page_construct (object_type, _tmp2_); + self = (TagPage*) collection_page_construct (object_type, _tmp1_); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_free0 (_tmp2_); -#line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = tag; + _g_free0 (_tmp1_); #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (tag); #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (self->priv->tag); #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - self->priv->tag = _tmp4_; + self->priv->tag = _tmp2_; #line 15 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = tag_global; + _tmp3_ = tag_global; #line 15 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tag_page_on_tags_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tag_page_on_tags_altered_data_collection_items_altered, self, 0); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = tag; + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_ = _tmp7_; + _tmp5_ = _tmp4_; #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - tag_mirror_sources (_tmp6_, _tmp8_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); + tag_mirror_sources (tag, _tmp5_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp5_); #line 18 "/home/jens/Source/shotwell/src/tags/TagPage.vala" checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TagsContextMenu"); #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self; -#line 838 "TagPage.c" +#line 952 "TagPage.c" } -TagPage* tag_page_new (Tag* tag) { +TagPage* +tag_page_new (Tag* tag) +{ #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return tag_page_construct (TYPE_TAG_PAGE, tag); -#line 845 "TagPage.c" +#line 961 "TagPage.c" } -static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +tag_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ TagPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 27 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = ui_filenames; -#line 27 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (tag_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), ui_filenames); #line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui"); -#line 865 "TagPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui"); +#line 978 "TagPage.c" } -Tag* tag_page_get_tag (TagPage* self) { +Tag* +tag_page_get_tag (TagPage* self) +{ Tag* result = NULL; Tag* _tmp0_; Tag* _tmp1_; @@ -879,11 +994,15 @@ Tag* tag_page_get_tag (TagPage* self) { result = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 883 "TagPage.c" +#line 998 "TagPage.c" } -static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +tag_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ TagPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -909,23 +1028,25 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor if (sort_order) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_order = _vala_sort_order; -#line 913 "TagPage.c" +#line 1032 "TagPage.c" } #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (sort_by) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_by = _vala_sort_by; -#line 919 "TagPage.c" +#line 1038 "TagPage.c" } } -static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +tag_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ TagPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 39 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -933,49 +1054,42 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = sort_order; -#line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = sort_by; -#line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 944 "TagPage.c" +#line 1061 "TagPage.c" } -static void tag_page_real_add_actions (Page* base, GActionMap* map) { +static void +tag_page_real_add_actions (Page* base, + GActionMap* map) +{ TagPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = map; -#line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = map; + PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); #line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - g_action_map_add_action_entries (_tmp1_, TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self); -#line 964 "TagPage.c" + g_action_map_add_action_entries (map, TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self); +#line 1078 "TagPage.c" } -static void tag_page_real_remove_actions (Page* base, GActionMap* map) { +static void +tag_page_real_remove_actions (Page* base, + GActionMap* map) +{ TagPage * self; - GActionMap* _tmp0_; #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = map; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 979 "TagPage.c" + PAGE_CLASS (tag_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); +#line 1093 "TagPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -987,90 +1101,80 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (TAG_PAGE_entries); #line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (TAG_PAGE_entries); entry_it = entry_it + 1) { -#line 991 "TagPage.c" +#line 1105 "TagPage.c" GActionEntry entry = {0}; #line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" entry = entry_collection[entry_it]; -#line 995 "TagPage.c" +#line 1109 "TagPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1008 "TagPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1119 "TagPage.c" } } } } -static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { - GeeMap* _tmp0_; - Tag* _tmp1_; - gboolean _tmp2_; +static void +tag_page_on_tags_altered (TagPage* self, + GeeMap* map) +{ + Tag* _tmp0_; #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = map; -#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = self->priv->tag; -#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = self->priv->tag; #line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if (_tmp2_) { -#line 1031 "TagPage.c" - Tag* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject))) { +#line 1139 "TagPage.c" + Tag* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + ViewCollection* _tmp4_; + ViewCollection* _tmp5_; ViewCollection* _tmp6_; ViewCollection* _tmp7_; - gint _tmp8_; - ViewCollection* _tmp9_; - ViewCollection* _tmp10_; - gint _tmp11_; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = self->priv->tag; + _tmp1_ = self->priv->tag; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_); + page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp3_); #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_free0 (_tmp5_); -#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp7_ = _tmp6_; + _g_free0 (_tmp3_); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_ = view_collection_get_selected_count (_tmp7_); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp8_, _tmp11_); + _tmp7_ = _tmp6_; #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp10_); + page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), view_collection_get_selected_count (_tmp5_), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection))); #line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp7_); -#line 1069 "TagPage.c" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _data_collection_unref0 (_tmp5_); +#line 1171 "TagPage.c" } } -static void tag_page_real_switched_to (Page* base) { +static void +tag_page_real_switched_to (Page* base) +{ TagPage * self; Tag* _tmp0_; gchar* _tmp1_; @@ -1139,11 +1243,15 @@ static void tag_page_real_switched_to (Page* base) { _g_free0 (_tmp14_); #line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp12_); -#line 1143 "TagPage.c" +#line 1247 "TagPage.c" } -static void tag_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +tag_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ TagPage * self; Tag* _tmp0_; gchar* _tmp1_; @@ -1158,12 +1266,8 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint Tag* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gint _tmp13_; + gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; - gint _tmp16_; - gint _tmp17_; - gint _tmp18_; #line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1205,30 +1309,24 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp12_ = _tmp11_; #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp13_ = selected_count; -#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_ = resources_untag_photos_menu (_tmp12_, _tmp13_); + _tmp13_ = resources_untag_photos_menu (_tmp12_, selected_count); #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp15_ = _tmp14_; -#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp16_ = selected_count; + _tmp14_ = _tmp13_; #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp15_, NULL, _tmp16_ > 0); + page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp14_, NULL, selected_count > 0); #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp12_); #line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_ = selected_count; -#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp18_ = count; -#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp17_, _tmp18_); -#line 1228 "TagPage.c" + PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count); +#line 1324 "TagPage.c" } -static void tag_page_on_new_child_tag_sidebar (TagPage* self) { +static void +tag_page_on_new_child_tag_sidebar (TagPage* self) +{ NewChildTagCommand* creation_command = NULL; Tag* _tmp0_; NewChildTagCommand* _tmp1_; @@ -1270,11 +1368,13 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) { _g_object_unref0 (_tmp5_); #line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (creation_command); -#line 1274 "TagPage.c" +#line 1372 "TagPage.c" } -static void tag_page_on_rename_tag (TagPage* self) { +static void +tag_page_on_rename_tag (TagPage* self) +{ LibraryWindow* _tmp0_; LibraryWindow* _tmp1_; Tag* _tmp2_; @@ -1290,53 +1390,53 @@ static void tag_page_on_rename_tag (TagPage* self) { library_window_rename_tag_in_sidebar (_tmp1_, _tmp2_); #line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 1294 "TagPage.c" +#line 1394 "TagPage.c" } -static void tag_page_on_delete_tag (TagPage* self) { +static void +tag_page_on_delete_tag (TagPage* self) +{ Tag* _tmp0_; - gboolean _tmp1_; #line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); -#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if (_tmp1_) { -#line 1309 "TagPage.c" + if (dialogs_confirm_delete_tag (_tmp0_)) { +#line 1408 "TagPage.c" + CommandManager* _tmp1_; CommandManager* _tmp2_; - CommandManager* _tmp3_; - Tag* _tmp4_; + Tag* _tmp3_; + DeleteTagCommand* _tmp4_; DeleteTagCommand* _tmp5_; - DeleteTagCommand* _tmp6_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = app_window_get_command_manager (); + _tmp1_ = app_window_get_command_manager (); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = self->priv->tag; + _tmp3_ = self->priv->tag; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = delete_tag_command_new (_tmp4_); + _tmp4_ = delete_tag_command_new (_tmp3_); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _command_manager_unref0 (_tmp3_); -#line 1331 "TagPage.c" + _command_manager_unref0 (_tmp2_); +#line 1430 "TagPage.c" } } -static void tag_page_on_remove_tag_from_photos (TagPage* self) { +static void +tag_page_on_remove_tag_from_photos (TagPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1344,68 +1444,65 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = _tmp2_ > 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0; #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp1_); #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if (_tmp3_) { -#line 1355 "TagPage.c" + if (_tmp2_) { +#line 1453 "TagPage.c" + CommandManager* _tmp3_; CommandManager* _tmp4_; - CommandManager* _tmp5_; - Tag* _tmp6_; + Tag* _tmp5_; + ViewCollection* _tmp6_; ViewCollection* _tmp7_; - ViewCollection* _tmp8_; - GeeList* _tmp9_; - GeeCollection* _tmp10_; + GeeList* _tmp8_; + GeeCollection* _tmp9_; + ViewCollection* _tmp10_; ViewCollection* _tmp11_; - ViewCollection* _tmp12_; - gint _tmp13_; - TagUntagPhotosCommand* _tmp14_; - TagUntagPhotosCommand* _tmp15_; + TagUntagPhotosCommand* _tmp12_; + TagUntagPhotosCommand* _tmp13_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = self->priv->tag; + _tmp4_ = _tmp3_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp5_ = self->priv->tag; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_ = _tmp7_; + _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp9_ = view_collection_get_selected_sources (_tmp8_); + _tmp7_ = _tmp6_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection); + _tmp8_ = view_collection_get_selected_sources (_tmp7_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp12_ = _tmp11_; + _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp13_ = view_collection_get_selected_count (_tmp12_); + _tmp11_ = _tmp10_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_ = tag_untag_photos_command_new (_tmp6_, _tmp10_, _tmp13_, FALSE); + _tmp12_ = tag_untag_photos_command_new (_tmp5_, _tmp9_, view_collection_get_selected_count (_tmp11_), FALSE); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp13_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp12_); + _data_collection_unref0 (_tmp11_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _data_collection_unref0 (_tmp8_); + _data_collection_unref0 (_tmp7_); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _command_manager_unref0 (_tmp5_); -#line 1404 "TagPage.c" + _command_manager_unref0 (_tmp4_); +#line 1499 "TagPage.c" } } -static void tag_page_class_init (TagPageClass * klass) { +static void +tag_page_class_init (TagPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1426,18 +1523,22 @@ static void tag_page_class_init (TagPageClass * klass) { ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) tag_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (klass)->finalize = tag_page_finalize; -#line 1430 "TagPage.c" +#line 1527 "TagPage.c" } -static void tag_page_instance_init (TagPage * self) { +static void +tag_page_instance_init (TagPage * self) +{ #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self->priv = TAG_PAGE_GET_PRIVATE (self); -#line 1437 "TagPage.c" +#line 1536 "TagPage.c" } -static void tag_page_finalize (GObject * obj) { +static void +tag_page_finalize (GObject * obj) +{ TagPage * self; ViewCollection* _tmp0_; ViewCollection* _tmp1_; @@ -1463,11 +1564,13 @@ static void tag_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->tag); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (tag_page_parent_class)->finalize (obj); -#line 1467 "TagPage.c" +#line 1568 "TagPage.c" } -GType tag_page_get_type (void) { +GType +tag_page_get_type (void) +{ static volatile gsize tag_page_type_id__volatile = 0; if (g_once_init_enter (&tag_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tag_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagPage), 0, (GInstanceInitFunc) tag_page_instance_init, NULL }; diff --git a/src/tags/Tags.c b/src/tags/Tags.c index f9f80dc..f03516a 100644 --- a/src/tags/Tags.c +++ b/src/tags/Tags.c @@ -1,4 +1,4 @@ -/* Tags.c generated by valac 0.36.6, the Vala compiler +/* Tags.c generated by valac 0.40.4, the Vala compiler * generated from Tags.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -19,17 +20,21 @@ void tags_terminate (void); void tags_sidebar_entry_terminate (void); -void tags_init (GError** error) { +void +tags_init (GError** error) +{ #line 10 "/home/jens/Source/shotwell/src/tags/Tags.vala" tags_sidebar_entry_init (); -#line 26 "Tags.c" +#line 29 "Tags.c" } -void tags_terminate (void) { +void +tags_terminate (void) +{ #line 14 "/home/jens/Source/shotwell/src/tags/Tags.vala" tags_sidebar_entry_terminate (); -#line 33 "Tags.c" +#line 38 "Tags.c" } diff --git a/src/tags/TagsBranch.c b/src/tags/TagsBranch.c index d86b3ac..a2494fc 100644 --- a/src/tags/TagsBranch.c +++ b/src/tags/TagsBranch.c @@ -1,4 +1,4 @@ -/* TagsBranch.c generated by valac 0.36.6, the Vala compiler +/* TagsBranch.c generated by valac 0.40.4, the Vala compiler * generated from TagsBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -89,6 +90,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass; typedef struct _TagsSidebarEntry TagsSidebarEntry; typedef struct _TagsSidebarEntryClass TagsSidebarEntryClass; +enum { + TAGS_BRANCH_0_PROPERTY, + TAGS_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* tags_branch_properties[TAGS_BRANCH_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -273,6 +279,11 @@ typedef struct _SidebarInternalDragSourceEntryIface SidebarInternalDragSourceEnt typedef struct _SidebarContextable SidebarContextable; typedef struct _SidebarContextableIface SidebarContextableIface; typedef struct _TagsHeaderPrivate TagsHeaderPrivate; +enum { + TAGS_HEADER_0_PROPERTY, + TAGS_HEADER_NUM_PROPERTIES +}; +static GParamSpec* tags_header_properties[TAGS_HEADER_NUM_PROPERTIES]; #define TYPE_APPLICATION (application_get_type ()) #define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application)) @@ -403,6 +414,11 @@ typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _SidebarDestroyableEntry SidebarDestroyableEntry; typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface; typedef struct _TagsSidebarEntryPrivate TagsSidebarEntryPrivate; +enum { + TAGS_SIDEBAR_ENTRY_0_PROPERTY, + TAGS_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* tags_sidebar_entry_properties[TAGS_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -658,31 +674,48 @@ GType tag_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType tags_sidebar_entry_get_type (void) G_GNUC_CONST; #define TAGS_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TAGS_TYPE_BRANCH, TagsBranchPrivate)) -enum { - TAGS_BRANCH_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType tag_source_collection_get_type (void) G_GNUC_CONST; -static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* added_raw, GeeIterable* removed); -static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void tags_branch_on_tags_added_removed (TagsBranch* self, + GeeIterable* added_raw, + GeeIterable* removed); +static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered); -static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void tags_branch_on_tags_altered (TagsBranch* self, + GeeMap* altered); +static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); TagsBranch* tags_branch_new (void); TagsBranch* tags_branch_construct (GType object_type); TagsHeader* tags_header_new (void); @@ -693,26 +726,47 @@ GType tags_header_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); +static gint tags_branch_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _tags_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); GeeCollection* data_collection_get_all (DataCollection* self); -TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag); +TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, + Tag* tag); gboolean tags_branch_is_user_renameable (TagsBranch* self); -gint tag_compare_names (Tag* a, Tag* b); +gint tag_compare_names (Tag* a, + Tag* b); Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self); -static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +static gint _tag_compare_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); Tag* tag_get_hierarchical_parent (Tag* self); TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag); -TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, + Tag* tag); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; gchar* tag_get_user_visible_name (Tag* self); -void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry); +void sidebar_branch_reorder (SidebarBranch* self, + SidebarEntry* entry); static void tags_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; @@ -722,69 +776,103 @@ GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; GType sidebar_internal_drag_source_entry_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; #define TAGS_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TAGS_TYPE_HEADER, TagsHeaderPrivate)) -enum { - TAGS_HEADER_DUMMY_PROPERTY -}; -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); static void tags_header_setup_context_menu (TagsHeader* self); gchar* resources_get_ui (const gchar* filename); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); gpointer application_ref (gpointer instance); void application_unref (gpointer instance); -GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_application (GValue* value, gpointer v_object); -void value_take_application (GValue* value, gpointer v_object); +GParamSpec* param_spec_application (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_application (GValue* value, + gpointer v_object); +void value_take_application (GValue* value, + gpointer v_object); gpointer value_get_application (const GValue* value); GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); void application_panic (Application* self); -static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); +static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType tags_dialog_get_type (void) G_GNUC_CONST; GType add_tags_dialog_get_type (void) G_GNUC_CONST; AddTagsDialog* add_tags_dialog_new (void); AddTagsDialog* add_tags_dialog_construct (GType object_type); -gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1); +gchar** add_tags_dialog_execute (AddTagsDialog* self, + int* result_length1); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); -AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources); -AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources); +void command_manager_execute (CommandManager* self, + Command* command); +AddTagsCommand* add_tags_command_new (gchar** paths, + int paths_length1, + GeeCollection* sources); +AddTagsCommand* add_tags_command_construct (GType object_type, + gchar** paths, + int paths_length1, + GeeCollection* sources); GType page_command_get_type (void) G_GNUC_CONST; GType add_tags_command_get_type (void) G_GNUC_CONST; -static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path" -gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root); +gboolean tag_source_collection_exists (TagSourceCollection* self, + const gchar* name, + gboolean treat_htags_as_root); GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); Tag* tag_for_path (const gchar* name); -ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path); -ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, const gchar* new_parent_path); +ReparentTagCommand* reparent_tag_command_new (Tag* tag, + const gchar* new_parent_path); +ReparentTagCommand* reparent_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_parent_path); GType reparent_tag_command_get_type (void) G_GNUC_CONST; -static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); -static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event); +static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data); +static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event); static void tags_header_finalize (GObject * obj); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST; #define TAGS_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntryPrivate)) -enum { - TAGS_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; #define RESOURCES_ICON_ONE_TAG "one-tag" SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); void tags_sidebar_entry_init (void); @@ -793,61 +881,95 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base); TagPage* tag_page_new (Tag* tag); -TagPage* tag_page_construct (GType object_type, Tag* tag); +TagPage* tag_page_construct (GType object_type, + Tag* tag); GType checkerboard_page_get_type (void) G_GNUC_CONST; GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType tag_page_get_type (void) G_GNUC_CONST; static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base); -static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name); +static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name); gchar* tag_prep_tag_name (const gchar* name); -RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name); -RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, const gchar* new_name); +RenameTagCommand* rename_tag_command_new (Tag* tag, + const gchar* new_name); +RenameTagCommand* rename_tag_command_construct (GType object_type, + Tag* tag, + const gchar* new_name); GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType rename_tag_command_get_type (void) G_GNUC_CONST; static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base); gboolean dialogs_confirm_delete_tag (Tag* tag); DeleteTagCommand* delete_tag_command_new (Tag* tag); -DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag); +DeleteTagCommand* delete_tag_command_construct (GType object_type, + Tag* tag); GType delete_tag_command_get_type (void) G_GNUC_CONST; -static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); -TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach); -TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach); +static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); +TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); +TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, + Tag* tag, + GeeCollection* sources, + gint count, + gboolean attach); GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; -static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); gchar* tag_get_path (Tag* self); GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base); -static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); +static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data); static void tags_sidebar_entry_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static void +_tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_on_tags_added_removed ((TagsBranch*) self, added, removed); -#line 831 "TagsBranch.c" +#line 944 "TagsBranch.c" } -static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_on_tags_altered ((TagsBranch*) self, items); -#line 838 "TagsBranch.c" +#line 955 "TagsBranch.c" } -static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_tags_branch_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = tags_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 847 "TagsBranch.c" +#line 967 "TagsBranch.c" } -TagsBranch* tags_branch_construct (GType object_type) { +TagsBranch* +tags_branch_construct (GType object_type) +{ TagsBranch * self = NULL; TagsHeader* _tmp0_; TagsHeader* _tmp1_; @@ -884,22 +1006,26 @@ TagsBranch* tags_branch_construct (GType object_type) { g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tags_branch_on_tags_altered_data_collection_items_altered, self, 0); #line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 888 "TagsBranch.c" +#line 1010 "TagsBranch.c" } -TagsBranch* tags_branch_new (void) { +TagsBranch* +tags_branch_new (void) +{ #line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_branch_construct (TAGS_TYPE_BRANCH); -#line 895 "TagsBranch.c" +#line 1019 "TagsBranch.c" } -TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) { +TagsSidebarEntry* +tags_branch_get_entry_for_tag (TagsBranch* self, + Tag* tag) +{ TagsSidebarEntry* result = NULL; GeeHashMap* _tmp0_; - Tag* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 30 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (TAGS_IS_BRANCH (self), NULL); #line 30 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -907,18 +1033,18 @@ TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) { #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->entry_map; #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = tag; -#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), tag); #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - result = (TagsSidebarEntry*) _tmp2_; + result = (TagsSidebarEntry*) _tmp1_; #line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 918 "TagsBranch.c" +#line 1042 "TagsBranch.c" } -gboolean tags_branch_is_user_renameable (TagsBranch* self) { +gboolean +tags_branch_is_user_renameable (TagsBranch* self) +{ gboolean result = FALSE; #line 34 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (TAGS_IS_BRANCH (self), FALSE); @@ -926,86 +1052,82 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) { result = TRUE; #line 35 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 930 "TagsBranch.c" +#line 1056 "TagsBranch.c" } -static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +tags_branch_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; + Tag* _tmp0_; + Tag* _tmp1_; + Tag* _tmp2_; Tag* _tmp3_; - Tag* _tmp4_; - SidebarEntry* _tmp5_; - Tag* _tmp6_; - Tag* _tmp7_; - gint _tmp8_; - gint _tmp9_; + gint _tmp4_; #line 38 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 38 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = a; -#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = b; -#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = 0; #line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 960 "TagsBranch.c" +#line 1080 "TagsBranch.c" } #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = a; -#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); -#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = _tmp3_; + _tmp0_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (a, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = b; + _tmp1_ = _tmp0_; #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); + _tmp2_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (b, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry)); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = _tmp6_; -#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = tag_compare_names (_tmp4_, _tmp7_); + _tmp3_ = _tmp2_; #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = _tmp8_; + _tmp4_ = tag_compare_names (_tmp1_, _tmp3_); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp3_); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp1_); #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - result = _tmp9_; + result = _tmp4_; #line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 986 "TagsBranch.c" +#line 1100 "TagsBranch.c" } -static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint +_tag_compare_names_gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gint result; result = tag_compare_names ((Tag*) a, (Tag*) b); #line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 995 "TagsBranch.c" +#line 1113 "TagsBranch.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self ? g_object_ref (self) : NULL; -#line 1002 "TagsBranch.c" +#line 1122 "TagsBranch.c" } -static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* added_raw, GeeIterable* removed) { +static void +tags_branch_on_tags_added_removed (TagsBranch* self, + GeeIterable* added_raw, + GeeIterable* removed) +{ Tag* restore_point = NULL; - GeeIterable* _tmp0_; - GeeIterable* _tmp49_; #line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (TAGS_IS_BRANCH (self)); #line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1015,560 +1137,533 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 51 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" restore_point = NULL; #line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = added_raw; -#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp0_ != NULL) { -#line 1022 "TagsBranch.c" + if (added_raw != NULL) { +#line 1142 "TagsBranch.c" GeeSortedSet* added = NULL; - GeeTreeSet* _tmp1_; + GeeTreeSet* _tmp0_; #line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); + _tmp0_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); #line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 1029 "TagsBranch.c" + added = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SORTED_SET, GeeSortedSet); +#line 1149 "TagsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp2_; - GeeIterator* _tmp3_; -#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = added_raw; + GeeIterator* _tmp1_; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = gee_iterable_iterator (_tmp2_); + _tmp1_ = gee_iterable_iterator (added_raw); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _object_it = _tmp3_; + _object_it = _tmp1_; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1042 "TagsBranch.c" - GeeIterator* _tmp4_; - gboolean _tmp5_; +#line 1159 "TagsBranch.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; + GeeIterator* _tmp3_; + gpointer _tmp4_; Tag* tag = NULL; - DataObject* _tmp8_; - Tag* _tmp9_; - GeeSortedSet* _tmp10_; - Tag* _tmp11_; + DataObject* _tmp5_; + Tag* _tmp6_; + GeeSortedSet* _tmp7_; + Tag* _tmp8_; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp2_)) { #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1061 "TagsBranch.c" +#line 1175 "TagsBranch.c" } #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _object_it; + _tmp3_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - object = (DataObject*) _tmp7_; + object = (DataObject*) _tmp4_; #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = object; + _tmp5_ = object; #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TAG, Tag)); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_TAG, Tag)); #line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = _tmp9_; + tag = _tmp6_; #line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = added; + _tmp7_ = added; #line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = tag; + _tmp8_ = tag; #line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1085 "TagsBranch.c" +#line 1199 "TagsBranch.c" } #line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1089 "TagsBranch.c" +#line 1203 "TagsBranch.c" } { GeeIterator* _tag_it = NULL; - GeeSortedSet* _tmp12_; - GeeIterator* _tmp13_; + GeeSortedSet* _tmp9_; + GeeIterator* _tmp10_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = added; + _tmp9_ = added; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tag_it = _tmp13_; + _tag_it = _tmp10_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1103 "TagsBranch.c" - GeeIterator* _tmp14_; - gboolean _tmp15_; +#line 1217 "TagsBranch.c" + GeeIterator* _tmp11_; Tag* tag = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; + GeeIterator* _tmp12_; + gpointer _tmp13_; Tag* parent_tag = NULL; - Tag* _tmp18_; - Tag* _tmp19_; + Tag* _tmp14_; + Tag* _tmp15_; TagsSidebarEntry* entry = NULL; + Tag* _tmp26_; + TagsSidebarEntry* _tmp27_; + GeeHashMap* _tmp28_; + Tag* _tmp29_; + TagsSidebarEntry* _tmp30_; Tag* _tmp31_; - TagsSidebarEntry* _tmp32_; - GeeHashMap* _tmp33_; - Tag* _tmp34_; - TagsSidebarEntry* _tmp35_; - Tag* _tmp36_; - Tag* _tmp37_; - Tag* _tmp38_; - Tag* _tmp47_; - Tag* _tmp48_; -#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = _tag_it; + Tag* _tmp32_; + Tag* _tmp33_; + Tag* _tmp42_; + Tag* _tmp43_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = gee_iterator_next (_tmp14_); + _tmp11_ = _tag_it; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp11_)) { #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1131 "TagsBranch.c" +#line 1242 "TagsBranch.c" } #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = _tag_it; + _tmp12_ = _tag_it; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = (Tag*) _tmp17_; + tag = (Tag*) _tmp13_; #line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = tag; + _tmp14_ = tag; #line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = tag_get_hierarchical_parent (_tmp18_); + _tmp15_ = tag_get_hierarchical_parent (_tmp14_); #line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_tag = _tmp19_; + parent_tag = _tmp15_; #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1147 "TagsBranch.c" - Tag* _tmp20_; - GeeHashMap* _tmp21_; - Tag* _tmp22_; - gboolean _tmp23_; - Tag* _tmp29_; - Tag* _tmp30_; +#line 1258 "TagsBranch.c" + Tag* _tmp16_; + GeeHashMap* _tmp17_; + Tag* _tmp18_; + Tag* _tmp24_; + Tag* _tmp25_; #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = parent_tag; + _tmp16_ = parent_tag; #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!(_tmp20_ != NULL)) { + if (!(_tmp16_ != NULL)) { #line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1160 "TagsBranch.c" +#line 1270 "TagsBranch.c" } #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = self->priv->entry_map; + _tmp17_ = self->priv->entry_map; #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = parent_tag; + _tmp18_ = parent_tag; #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_); -#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp23_) { -#line 1170 "TagsBranch.c" + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_)) { +#line 1278 "TagsBranch.c" TagsSidebarEntry* parent_entry = NULL; - Tag* _tmp24_; - TagsSidebarEntry* _tmp25_; - GeeHashMap* _tmp26_; - Tag* _tmp27_; - TagsSidebarEntry* _tmp28_; + Tag* _tmp19_; + TagsSidebarEntry* _tmp20_; + GeeHashMap* _tmp21_; + Tag* _tmp22_; + TagsSidebarEntry* _tmp23_; #line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp24_ = parent_tag; + _tmp19_ = parent_tag; #line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp25_ = tags_sidebar_entry_new (_tmp24_); + _tmp20_ = tags_sidebar_entry_new (_tmp19_); #line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_entry = _tmp25_; + parent_entry = _tmp20_; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp26_ = self->priv->entry_map; + _tmp21_ = self->priv->entry_map; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp27_ = parent_tag; + _tmp22_ = parent_tag; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp28_ = parent_entry; + _tmp23_ = parent_entry; #line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, _tmp23_); #line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_entry); -#line 1193 "TagsBranch.c" +#line 1301 "TagsBranch.c" } #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp29_ = parent_tag; + _tmp24_ = parent_tag; #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp30_ = tag_get_hierarchical_parent (_tmp29_); + _tmp25_ = tag_get_hierarchical_parent (_tmp24_); #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); #line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_tag = _tmp30_; -#line 1203 "TagsBranch.c" + parent_tag = _tmp25_; +#line 1311 "TagsBranch.c" } #line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp31_ = tag; + _tmp26_ = tag; #line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp32_ = tags_sidebar_entry_new (_tmp31_); + _tmp27_ = tags_sidebar_entry_new (_tmp26_); #line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - entry = _tmp32_; + entry = _tmp27_; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp33_ = self->priv->entry_map; + _tmp28_ = self->priv->entry_map; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp34_ = tag; + _tmp29_ = tag; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp35_ = entry; + _tmp30_ = entry; #line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_); #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp36_ = tag; + _tmp31_ = tag; #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp37_ = tag_get_hierarchical_parent (_tmp36_); + _tmp32_ = tag_get_hierarchical_parent (_tmp31_); #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); #line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_tag = _tmp37_; + parent_tag = _tmp32_; #line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp38_ = parent_tag; + _tmp33_ = parent_tag; #line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp38_ != NULL) { -#line 1231 "TagsBranch.c" + if (_tmp33_ != NULL) { +#line 1339 "TagsBranch.c" TagsSidebarEntry* parent_entry = NULL; - GeeHashMap* _tmp39_; - Tag* _tmp40_; - gpointer _tmp41_; - TagsSidebarEntry* _tmp42_; - TagsSidebarEntry* _tmp43_; + GeeHashMap* _tmp34_; + Tag* _tmp35_; + gpointer _tmp36_; + TagsSidebarEntry* _tmp37_; + TagsSidebarEntry* _tmp38_; #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp39_ = self->priv->entry_map; + _tmp34_ = self->priv->entry_map; #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp40_ = parent_tag; + _tmp35_ = parent_tag; #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp41_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp40_); + _tmp36_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_); #line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_entry = (TagsSidebarEntry*) _tmp41_; + parent_entry = (TagsSidebarEntry*) _tmp36_; #line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp42_ = parent_entry; + _tmp37_ = parent_entry; #line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp43_ = entry; + _tmp38_ = entry; #line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_entry); -#line 1254 "TagsBranch.c" +#line 1362 "TagsBranch.c" } else { - SidebarEntry* _tmp44_; - SidebarEntry* _tmp45_; - TagsSidebarEntry* _tmp46_; + SidebarEntry* _tmp39_; + SidebarEntry* _tmp40_; + TagsSidebarEntry* _tmp41_; #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp44_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp39_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp45_ = _tmp44_; + _tmp40_ = _tmp39_; #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp46_ = entry; + _tmp41_ = entry; #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp45_); -#line 1269 "TagsBranch.c" + _g_object_unref0 (_tmp40_); +#line 1377 "TagsBranch.c" } #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp47_ = tag; + _tmp42_ = tag; #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp48_ = _g_object_ref0 (_tmp47_); + _tmp43_ = _g_object_ref0 (_tmp42_); #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (restore_point); #line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - restore_point = _tmp48_; + restore_point = _tmp43_; #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); -#line 1285 "TagsBranch.c" +#line 1393 "TagsBranch.c" } #line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tag_it); -#line 1289 "TagsBranch.c" +#line 1397 "TagsBranch.c" } #line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (added); -#line 1293 "TagsBranch.c" +#line 1401 "TagsBranch.c" } #line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp49_ = removed; -#line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp49_ != NULL) { -#line 1299 "TagsBranch.c" + if (removed != NULL) { +#line 1405 "TagsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp50_; - GeeIterator* _tmp51_; -#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp50_ = removed; + GeeIterator* _tmp44_; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp51_ = gee_iterable_iterator (_tmp50_); + _tmp44_ = gee_iterable_iterator (removed); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _object_it = _tmp51_; + _object_it = _tmp44_; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1312 "TagsBranch.c" - GeeIterator* _tmp52_; - gboolean _tmp53_; +#line 1415 "TagsBranch.c" + GeeIterator* _tmp45_; DataObject* object = NULL; - GeeIterator* _tmp54_; - gpointer _tmp55_; + GeeIterator* _tmp46_; + gpointer _tmp47_; Tag* tag = NULL; - DataObject* _tmp56_; - Tag* _tmp57_; + DataObject* _tmp48_; + Tag* _tmp49_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp58_; - Tag* _tmp59_; - gpointer _tmp60_; - TagsSidebarEntry* _tmp61_; + GeeHashMap* _tmp50_; + Tag* _tmp51_; + gpointer _tmp52_; + TagsSidebarEntry* _tmp53_; gboolean is_removed = FALSE; - GeeHashMap* _tmp62_; - Tag* _tmp63_; - gboolean _tmp64_; - gboolean _tmp65_; - TagsSidebarEntry* _tmp66_; -#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp52_ = _object_it; + GeeHashMap* _tmp54_; + Tag* _tmp55_; + gboolean _tmp56_; + gboolean _tmp57_; + TagsSidebarEntry* _tmp58_; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp53_ = gee_iterator_next (_tmp52_); + _tmp45_ = _object_it; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp53_) { + if (!gee_iterator_next (_tmp45_)) { #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1340 "TagsBranch.c" +#line 1440 "TagsBranch.c" } #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp54_ = _object_it; + _tmp46_ = _object_it; #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp55_ = gee_iterator_get (_tmp54_); + _tmp47_ = gee_iterator_get (_tmp46_); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - object = (DataObject*) _tmp55_; + object = (DataObject*) _tmp47_; #line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp56_ = object; + _tmp48_ = object; #line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_TAG, Tag)); + _tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_TAG, Tag)); #line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = _tmp57_; + tag = _tmp49_; #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp58_ = self->priv->entry_map; + _tmp50_ = self->priv->entry_map; #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp59_ = tag; + _tmp51_ = tag; #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp60_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp59_); + _tmp52_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp51_); #line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - entry = (TagsSidebarEntry*) _tmp60_; + entry = (TagsSidebarEntry*) _tmp52_; #line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp61_ = entry; + _tmp53_ = entry; #line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp61_ != NULL, "entry != null"); + _vala_assert (_tmp53_ != NULL, "entry != null"); #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp62_ = self->priv->entry_map; + _tmp54_ = self->priv->entry_map; #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp63_ = tag; + _tmp55_ = tag; #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp64_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_, NULL); + _tmp56_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp55_, NULL); #line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - is_removed = _tmp64_; + is_removed = _tmp56_; #line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp65_ = is_removed; + _tmp57_ = is_removed; #line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp65_, "is_removed"); + _vala_assert (_tmp57_, "is_removed"); #line 104 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp66_ = entry; + _tmp58_ = entry; #line 104 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1388 "TagsBranch.c" +#line 1488 "TagsBranch.c" } #line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1392 "TagsBranch.c" +#line 1492 "TagsBranch.c" } } #line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (restore_point); -#line 1397 "TagsBranch.c" +#line 1497 "TagsBranch.c" } -static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { +static void +tags_branch_on_tags_altered (TagsBranch* self, + GeeMap* altered) +{ #line 109 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (TAGS_IS_BRANCH (self)); #line 109 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 1406 "TagsBranch.c" +#line 1509 "TagsBranch.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = altered; + _tmp0_ = gee_map_get_keys (altered); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = _tmp1_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp4_ = _tmp3_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = _tmp4_; + _g_object_unref0 (_tmp2_); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp3_); -#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1433 "TagsBranch.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1533 "TagsBranch.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; + DataObject* _tmp8_; gpointer _tmp9_; - GeeMap* _tmp10_; - DataObject* _tmp11_; - gpointer _tmp12_; - Alteration* _tmp13_; - gboolean _tmp14_; - gboolean _tmp15_; + Alteration* _tmp10_; + gboolean _tmp11_; Tag* tag = NULL; - DataObject* _tmp16_; - Tag* _tmp17_; + DataObject* _tmp12_; + Tag* _tmp13_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp18_; + GeeHashMap* _tmp14_; + Tag* _tmp15_; + gpointer _tmp16_; + TagsSidebarEntry* _tmp17_; + TagsSidebarEntry* _tmp18_; Tag* _tmp19_; - gpointer _tmp20_; - TagsSidebarEntry* _tmp21_; + gchar* _tmp20_; + gchar* _tmp21_; TagsSidebarEntry* _tmp22_; Tag* _tmp23_; gchar* _tmp24_; gchar* _tmp25_; TagsSidebarEntry* _tmp26_; - Tag* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - TagsSidebarEntry* _tmp30_; -#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1470 "TagsBranch.c" +#line 1565 "TagsBranch.c" } #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - object = (DataObject*) _tmp9_; -#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = altered; + object = (DataObject*) _tmp7_; #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = object; + _tmp8_ = object; #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = gee_map_get (_tmp10_, _tmp11_); + _tmp9_ = gee_map_get (altered, _tmp8_); #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = (Alteration*) _tmp12_; + _tmp10_ = (Alteration*) _tmp9_; #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = alteration_has_detail (_tmp13_, "metadata", "name"); + _tmp11_ = !alteration_has_detail (_tmp10_, "metadata", "name"); #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = !_tmp14_; + _alteration_unref0 (_tmp10_); #line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _alteration_unref0 (_tmp13_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp15_) { + if (_tmp11_) { #line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); #line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" continue; -#line 1498 "TagsBranch.c" +#line 1589 "TagsBranch.c" } #line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = object; + _tmp12_ = object; #line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_TAG, Tag)); + _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_TAG, Tag)); #line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - tag = _tmp17_; + tag = _tmp13_; #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = self->priv->entry_map; + _tmp14_ = self->priv->entry_map; #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = tag; + _tmp15_ = tag; #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); + _tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_); #line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - entry = (TagsSidebarEntry*) _tmp20_; + entry = (TagsSidebarEntry*) _tmp16_; #line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = entry; + _tmp17_ = entry; #line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp21_ != NULL, "entry != null"); + _vala_assert (_tmp17_ != NULL, "entry != null"); #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = entry; + _tmp18_ = entry; #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = tag; + _tmp19_ = tag; #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp24_ = tag_get_user_visible_name (_tmp23_); + _tmp20_ = tag_get_user_visible_name (_tmp19_); #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp25_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp21_); #line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp21_); #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp26_ = entry; + _tmp22_ = entry; #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp27_ = tag; + _tmp23_ = tag; #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp28_ = tag_get_user_visible_name (_tmp27_); + _tmp24_ = tag_get_user_visible_name (_tmp23_); #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp29_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp25_); #line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp25_); #line 120 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp30_ = entry; + _tmp26_ = entry; #line 120 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - sidebar_branch_reorder (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + sidebar_branch_reorder (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1552 "TagsBranch.c" +#line 1643 "TagsBranch.c" } #line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1556 "TagsBranch.c" +#line 1647 "TagsBranch.c" } } -static void tags_branch_class_init (TagsBranchClass * klass) { +static void +tags_branch_class_init (TagsBranchClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_type_class_add_private (klass, sizeof (TagsBranchPrivate)); #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_branch_finalize; -#line 1568 "TagsBranch.c" +#line 1661 "TagsBranch.c" } -static void tags_branch_instance_init (TagsBranch * self) { +static void +tags_branch_instance_init (TagsBranch * self) +{ GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_BRANCH_GET_PRIVATE (self); @@ -1576,11 +1671,13 @@ static void tags_branch_instance_init (TagsBranch * self) { _tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->entry_map = _tmp0_; -#line 1580 "TagsBranch.c" +#line 1675 "TagsBranch.c" } -static void tags_branch_finalize (GObject * obj) { +static void +tags_branch_finalize (GObject * obj) +{ TagsBranch * self; TagSourceCollection* _tmp0_; guint _tmp1_; @@ -1604,11 +1701,13 @@ static void tags_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->entry_map); #line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_branch_parent_class)->finalize (obj); -#line 1608 "TagsBranch.c" +#line 1705 "TagsBranch.c" } -GType tags_branch_get_type (void) { +GType +tags_branch_get_type (void) +{ static volatile gsize tags_branch_type_id__volatile = 0; if (g_once_init_enter (&tags_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagsBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tags_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagsBranch), 0, (GInstanceInitFunc) tags_branch_instance_init, NULL }; @@ -1620,7 +1719,9 @@ GType tags_branch_get_type (void) { } -TagsHeader* tags_header_construct (GType object_type) { +TagsHeader* +tags_header_construct (GType object_type) +{ TagsHeader * self = NULL; #line 131 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), _ ("Organize and browse your photo’s tags"), TRUE); @@ -1628,18 +1729,22 @@ TagsHeader* tags_header_construct (GType object_type) { tags_header_setup_context_menu (self); #line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 1632 "TagsBranch.c" +#line 1733 "TagsBranch.c" } -TagsHeader* tags_header_new (void) { +TagsHeader* +tags_header_new (void) +{ #line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_header_construct (TAGS_TYPE_HEADER); -#line 1639 "TagsBranch.c" +#line 1742 "TagsBranch.c" } -static void tags_header_setup_context_menu (TagsHeader* self) { +static void +tags_header_setup_context_menu (TagsHeader* self) +{ GtkBuilder* _tmp0_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1650,7 +1755,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_object_unref0 (self->priv->builder); #line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->builder = _tmp0_; -#line 1654 "TagsBranch.c" +#line 1759 "TagsBranch.c" { GtkBuilder* _tmp1_; gchar* _tmp2_; @@ -1673,7 +1778,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_free0 (_tmp3_); #line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1677 "TagsBranch.c" +#line 1782 "TagsBranch.c" goto __catch61_g_error; } #line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1696,7 +1801,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { self->priv->context_menu = _tmp8_; #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (model); -#line 1700 "TagsBranch.c" +#line 1805 "TagsBranch.c" } goto __finally61; __catch61_g_error: @@ -1734,7 +1839,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _application_unref0 (_tmp14_); #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_error_free0 (_error_); -#line 1738 "TagsBranch.c" +#line 1843 "TagsBranch.c" } __finally61: #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1745,12 +1850,15 @@ static void tags_header_setup_context_menu (TagsHeader* self) { g_clear_error (&_inner_error_); #line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 1749 "TagsBranch.c" +#line 1854 "TagsBranch.c" } } -static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +tags_header_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ TagsHeader * self; gboolean result = FALSE; AddTagsDialog* dialog = NULL; @@ -1768,9 +1876,8 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg CommandManager* _tmp8_; gchar** _tmp9_; gint _tmp9__length1; - GeeList* _tmp10_; + AddTagsCommand* _tmp10_; AddTagsCommand* _tmp11_; - AddTagsCommand* _tmp12_; #line 148 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 148 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1797,7 +1904,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg if (_tmp5_ == NULL) { #line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = TRUE; -#line 1801 "TagsBranch.c" +#line 1908 "TagsBranch.c" } else { gchar** _tmp6_; gint _tmp6__length1; @@ -1807,7 +1914,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _tmp6__length1 = names_length1; #line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp6__length1 == 0; -#line 1811 "TagsBranch.c" +#line 1918 "TagsBranch.c" } #line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp4_) { @@ -1819,7 +1926,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1823 "TagsBranch.c" +#line 1930 "TagsBranch.c" } #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = app_window_get_command_manager (); @@ -1830,15 +1937,13 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9__length1 = names_length1; #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = media; -#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection)); #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp11_); #line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp8_); #line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -1849,146 +1954,143 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1853 "TagsBranch.c" +#line 1958 "TagsBranch.c" } -static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ TagsHeader * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_; - GdkAtom _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; + gboolean _tmp2_; #line 159 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 159 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (data != NULL, FALSE); #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = data; -#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gtk_selection_data_get_data_type (_tmp0_); -#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = gdk_atom_name (_tmp1_); + _tmp0_ = gdk_atom_name (gtk_selection_data_get_data_type (data)); #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; + _tmp2_ = g_strcmp0 (_tmp1_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp4_) { -#line 1883 "TagsBranch.c" + if (_tmp2_) { +#line 1985 "TagsBranch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_; - guchar* _tmp6_; - gchar* _tmp7_; - TagSourceCollection* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - const gchar* _tmp11_; - GeeList* _tmp12_; - GeeList* _tmp13_; - gint _tmp14_; - gint _tmp15_; - gboolean _tmp16_; - CommandManager* _tmp17_; - CommandManager* _tmp18_; - const gchar* _tmp19_; - Tag* _tmp20_; - Tag* _tmp21_; - ReparentTagCommand* _tmp22_; - ReparentTagCommand* _tmp23_; -#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = data; + guint8* _tmp3_; + gchar* _tmp4_; + TagSourceCollection* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + GeeList* _tmp8_; + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; + gboolean _tmp12_; + CommandManager* _tmp13_; + CommandManager* _tmp14_; + const gchar* _tmp15_; + Tag* _tmp16_; + Tag* _tmp17_; + ReparentTagCommand* _tmp18_; + ReparentTagCommand* _tmp19_; #line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = gtk_selection_data_get_data (_tmp5_); + _tmp3_ = gtk_selection_data_get_data (data); #line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = g_strdup ((const gchar*) _tmp6_); + _tmp4_ = g_strdup ((const gchar*) _tmp3_); #line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag_path = _tmp7_; + old_tag_path = _tmp4_; #line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = tag_global; + _tmp5_ = tag_global; #line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = old_tag_path; + _tmp6_ = old_tag_path; #line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE); -#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp10_, "Tag.global.exists(old_tag_path)"); + _vala_assert (tag_source_collection_exists (_tmp5_, _tmp6_, FALSE), "Tag.global.exists(old_tag_path)"); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = old_tag_path; + _tmp7_ = old_tag_path; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); + _tmp8_ = hierarchical_tag_utilities_enumerate_path_components (_tmp7_); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = _tmp15_ < 2; + _tmp12_ = _tmp11_ < 2; #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp16_) { + if (_tmp12_) { #line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); #line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1942 "TagsBranch.c" +#line 2038 "TagsBranch.c" } #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = app_window_get_command_manager (); + _tmp13_ = app_window_get_command_manager (); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = old_tag_path; + _tmp15_ = old_tag_path; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = tag_for_path (_tmp19_); + _tmp16_ = tag_for_path (_tmp15_); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = reparent_tag_command_new (_tmp21_, "/"); + _tmp18_ = reparent_tag_command_new (_tmp17_, "/"); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_COMMAND, Command)); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp19_); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp17_); #line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp18_); + _command_manager_unref0 (_tmp14_); #line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); #line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1972 "TagsBranch.c" +#line 2068 "TagsBranch.c" } #line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; #line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1978 "TagsBranch.c" +#line 2074 "TagsBranch.c" } -static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) { +static void +tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data) +{ TagsHeader * self; #line 177 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 177 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (data != NULL); -#line 1988 "TagsBranch.c" +#line 2087 "TagsBranch.c" } -static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) { +static GtkMenu* +tags_header_real_get_sidebar_context_menu (SidebarContextable* base, + GdkEventButton* event) +{ TagsHeader * self; GtkMenu* result = NULL; GtkMenu* _tmp0_; @@ -2003,60 +2105,72 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b result = _tmp1_; #line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2007 "TagsBranch.c" +#line 2109 "TagsBranch.c" } -static void tags_header_class_init (TagsHeaderClass * klass) { +static void +tags_header_class_init (TagsHeaderClass * klass) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_parent_class = g_type_class_peek_parent (klass); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_type_class_add_private (klass, sizeof (TagsHeaderPrivate)); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_header_finalize; -#line 2018 "TagsBranch.c" +#line 2122 "TagsBranch.c" } -static void tags_header_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +tags_header_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_header_real_internal_drop_received; #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary; -#line 2029 "TagsBranch.c" +#line 2135 "TagsBranch.c" } -static void tags_header_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) { +static void +tags_header_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_header_real_prepare_selection_data; -#line 2038 "TagsBranch.c" +#line 2146 "TagsBranch.c" } -static void tags_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) { +static void +tags_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) tags_header_real_get_sidebar_context_menu; -#line 2047 "TagsBranch.c" +#line 2157 "TagsBranch.c" } -static void tags_header_instance_init (TagsHeader * self) { +static void +tags_header_instance_init (TagsHeader * self) +{ #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_HEADER_GET_PRIVATE (self); #line 128 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->context_menu = NULL; -#line 2056 "TagsBranch.c" +#line 2168 "TagsBranch.c" } -static void tags_header_finalize (GObject * obj) { +static void +tags_header_finalize (GObject * obj) +{ TagsHeader * self; #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader); @@ -2066,11 +2180,13 @@ static void tags_header_finalize (GObject * obj) { _g_object_unref0 (self->priv->context_menu); #line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj); -#line 2070 "TagsBranch.c" +#line 2184 "TagsBranch.c" } -GType tags_header_get_type (void) { +GType +tags_header_get_type (void) +{ static volatile gsize tags_header_type_id__volatile = 0; if (g_once_init_enter (&tags_header_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagsHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tags_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagsHeader), 0, (GInstanceInitFunc) tags_header_instance_init, NULL }; @@ -2088,44 +2204,52 @@ GType tags_header_get_type (void) { } -TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) { +TagsSidebarEntry* +tags_sidebar_entry_construct (GType object_type, + Tag* tag) +{ TagsSidebarEntry * self = NULL; Tag* _tmp0_; - Tag* _tmp1_; #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = (TagsSidebarEntry*) sidebar_simple_page_entry_construct (object_type); #line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = tag; -#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (tag); #line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->tag); #line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - self->priv->tag = _tmp1_; + self->priv->tag = _tmp0_; #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 2110 "TagsBranch.c" +#line 2226 "TagsBranch.c" } -TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) { +TagsSidebarEntry* +tags_sidebar_entry_new (Tag* tag) +{ #line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag); -#line 2117 "TagsBranch.c" +#line 2235 "TagsBranch.c" } -void tags_sidebar_entry_init (void) { +void +tags_sidebar_entry_init (void) +{ } -void tags_sidebar_entry_terminate (void) { +void +tags_sidebar_entry_terminate (void) +{ } -Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { +Tag* +tags_sidebar_entry_for_tag (TagsSidebarEntry* self) +{ Tag* result = NULL; Tag* _tmp0_; Tag* _tmp1_; @@ -2139,11 +2263,13 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { result = _tmp1_; #line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2143 "TagsBranch.c" +#line 2267 "TagsBranch.c" } -static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ TagsSidebarEntry * self; gchar* result = NULL; Tag* _tmp0_; @@ -2158,11 +2284,13 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* result = _tmp1_; #line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2162 "TagsBranch.c" +#line 2288 "TagsBranch.c" } -static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ TagsSidebarEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -2177,11 +2305,13 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* result = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2181 "TagsBranch.c" +#line 2309 "TagsBranch.c" } -static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ TagsSidebarEntry * self; Page* result = NULL; Tag* _tmp0_; @@ -2198,11 +2328,13 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2202 "TagsBranch.c" +#line 2332 "TagsBranch.c" } -static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) { +static gboolean +tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) +{ TagsSidebarEntry * self; gboolean result = FALSE; #line 219 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2211,325 +2343,314 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt result = TRUE; #line 220 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2215 "TagsBranch.c" +#line 2347 "TagsBranch.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 2234 "TagsBranch.c" +#line 2370 "TagsBranch.c" } else { - const gchar* _tmp2_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 2241 "TagsBranch.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 2374 "TagsBranch.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 2247 "TagsBranch.c" +#line 2380 "TagsBranch.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 2257 "TagsBranch.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 2384 "TagsBranch.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 2261 "TagsBranch.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2388 "TagsBranch.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2269 "TagsBranch.c" +#line 2396 "TagsBranch.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2301 "TagsBranch.c" +#line 2424 "TagsBranch.c" goto __catch62_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 2310 "TagsBranch.c" +#line 2433 "TagsBranch.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2326 "TagsBranch.c" +#line 2447 "TagsBranch.c" goto __catch62_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 2337 "TagsBranch.c" +#line 2458 "TagsBranch.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2351 "TagsBranch.c" +#line 2472 "TagsBranch.c" } goto __finally62; __catch62_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2365 "TagsBranch.c" +#line 2486 "TagsBranch.c" } __finally62: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 2376 "TagsBranch.c" +#line 2497 "TagsBranch.c" } } -static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { +static void +tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name) +{ TagsSidebarEntry * self; gchar* prepped = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; + const gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - const gchar* _tmp5_; - Tag* _tmp6_; + gchar* _tmp3_; + const gchar* _tmp4_; + Tag* _tmp5_; + gchar* _tmp6_; gchar* _tmp7_; - gchar* _tmp8_; - gboolean _tmp9_; - const gchar* _tmp10_; + gboolean _tmp8_; + const gchar* _tmp9_; + CommandManager* _tmp10_; CommandManager* _tmp11_; - CommandManager* _tmp12_; - Tag* _tmp13_; - const gchar* _tmp14_; + Tag* _tmp12_; + const gchar* _tmp13_; + RenameTagCommand* _tmp14_; RenameTagCommand* _tmp15_; - RenameTagCommand* _tmp16_; #line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (new_name != NULL); #line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = new_name; -#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = tag_prep_tag_name (_tmp0_); + _tmp0_ = tag_prep_tag_name (new_name); #line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - prepped = _tmp1_; + prepped = _tmp0_; #line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = prepped; + _tmp1_ = prepped; #line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2419 "TagsBranch.c" +#line 2540 "TagsBranch.c" } #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = prepped; + _tmp2_ = prepped; #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = string_replace (_tmp3_, "/", ""); + _tmp3_ = string_replace (_tmp2_, "/", ""); #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - prepped = _tmp4_; + prepped = _tmp3_; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = prepped; + _tmp4_ = prepped; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = self->priv->tag; + _tmp5_ = self->priv->tag; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = tag_get_user_visible_name (_tmp6_); + _tmp6_ = tag_get_user_visible_name (_tmp5_); #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0; + _tmp8_ = g_strcmp0 (_tmp4_, _tmp7_) == 0; #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp9_) { + if (_tmp8_) { #line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2447 "TagsBranch.c" +#line 2568 "TagsBranch.c" } #line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = prepped; + _tmp9_ = prepped; #line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (g_strcmp0 (_tmp10_, "") == 0) { + if (g_strcmp0 (_tmp9_, "") == 0) { #line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); #line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2457 "TagsBranch.c" +#line 2578 "TagsBranch.c" } #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = app_window_get_command_manager (); + _tmp10_ = app_window_get_command_manager (); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = self->priv->tag; + _tmp12_ = self->priv->tag; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = prepped; + _tmp13_ = prepped; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = rename_tag_command_new (_tmp13_, _tmp14_); + _tmp14_ = rename_tag_command_new (_tmp12_, _tmp13_); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command)); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp12_); + _command_manager_unref0 (_tmp11_); #line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); -#line 2479 "TagsBranch.c" +#line 2600 "TagsBranch.c" } -static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) { +static void +tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) +{ TagsSidebarEntry * self; Tag* _tmp0_; - gboolean _tmp1_; #line 239 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->tag; #line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); -#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp1_) { -#line 2495 "TagsBranch.c" + if (dialogs_confirm_delete_tag (_tmp0_)) { +#line 2615 "TagsBranch.c" + CommandManager* _tmp1_; CommandManager* _tmp2_; - CommandManager* _tmp3_; - Tag* _tmp4_; + Tag* _tmp3_; + DeleteTagCommand* _tmp4_; DeleteTagCommand* _tmp5_; - DeleteTagCommand* _tmp6_; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = app_window_get_command_manager (); + _tmp1_ = app_window_get_command_manager (); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = self->priv->tag; + _tmp3_ = self->priv->tag; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = delete_tag_command_new (_tmp4_); + _tmp4_ = delete_tag_command_new (_tmp3_); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command)); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp3_); -#line 2517 "TagsBranch.c" + _command_manager_unref0 (_tmp2_); +#line 2637 "TagsBranch.c" } } -static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ TagsSidebarEntry * self; gboolean result = FALSE; CommandManager* _tmp0_; CommandManager* _tmp1_; Tag* _tmp2_; - GeeList* _tmp3_; - GeeList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - TagUntagPhotosCommand* _tmp7_; - TagUntagPhotosCommand* _tmp8_; + gint _tmp3_; + gint _tmp4_; + TagUntagPhotosCommand* _tmp5_; + TagUntagPhotosCommand* _tmp6_; #line 244 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 244 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2541,192 +2662,181 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = self->priv->tag; #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = media; + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection)); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = media; + _tmp4_ = _tmp3_; #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_, TRUE); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _tmp5_; #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_, TRUE); -#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = _tmp7_; -#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp6_); #line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp1_); #line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2566 "TagsBranch.c" +#line 2683 "TagsBranch.c" } -static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ TagsSidebarEntry * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_; - GdkAtom _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; + gchar* _tmp0_; + gchar* _tmp1_; + gboolean _tmp2_; #line 251 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 251 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (data != NULL, FALSE); #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = data; -#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gtk_selection_data_get_data_type (_tmp0_); + _tmp0_ = gdk_atom_name (gtk_selection_data_get_data_type (data)); #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = gdk_atom_name (_tmp1_); -#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; + _tmp2_ = g_strcmp0 (_tmp1_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp1_); #line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp4_) { -#line 2596 "TagsBranch.c" + if (_tmp2_) { +#line 2710 "TagsBranch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_; - guchar* _tmp6_; + guint8* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + Tag* _tmp6_; gchar* _tmp7_; - const gchar* _tmp8_; - Tag* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - gboolean _tmp12_; - TagSourceCollection* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; + gchar* _tmp8_; + gboolean _tmp9_; + TagSourceCollection* _tmp26_; + const gchar* _tmp27_; Tag* old_tag = NULL; - const gchar* _tmp32_; - Tag* _tmp33_; + const gchar* _tmp28_; + Tag* _tmp29_; Tag* old_tag_parent = NULL; - Tag* _tmp34_; - Tag* _tmp35_; - gboolean _tmp36_ = FALSE; - Tag* _tmp37_; - CommandManager* _tmp44_; - CommandManager* _tmp45_; - Tag* _tmp46_; - Tag* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - ReparentTagCommand* _tmp50_; - ReparentTagCommand* _tmp51_; -#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = data; + Tag* _tmp30_; + Tag* _tmp31_; + gboolean _tmp32_ = FALSE; + Tag* _tmp33_; + CommandManager* _tmp40_; + CommandManager* _tmp41_; + Tag* _tmp42_; + Tag* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + ReparentTagCommand* _tmp46_; + ReparentTagCommand* _tmp47_; #line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = gtk_selection_data_get_data (_tmp5_); + _tmp3_ = gtk_selection_data_get_data (data); #line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp7_ = g_strdup ((const gchar*) _tmp6_); + _tmp4_ = g_strdup ((const gchar*) _tmp3_); #line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag_path = _tmp7_; + old_tag_path = _tmp4_; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp8_ = old_tag_path; + _tmp5_ = old_tag_path; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp9_ = self->priv->tag; + _tmp6_ = self->priv->tag; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp10_ = tag_get_path (_tmp9_); + _tmp7_ = tag_get_path (_tmp6_); #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp12_ = g_strcmp0 (_tmp8_, _tmp11_) == 0; + _tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0; #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp8_); #line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp12_) { + if (_tmp9_) { #line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); #line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2653 "TagsBranch.c" +#line 2763 "TagsBranch.c" } { GeeList* _parent_path_list = NULL; - Tag* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - GeeList* _tmp16_; - GeeList* _tmp17_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + GeeList* _tmp13_; + GeeList* _tmp14_; gint _parent_path_size = 0; - GeeList* _tmp18_; - gint _tmp19_; - gint _tmp20_; + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; gint _parent_path_index = 0; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp13_ = self->priv->tag; + _tmp10_ = self->priv->tag; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp14_ = tag_get_path (_tmp13_); + _tmp11_ = tag_get_path (_tmp10_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_); + _tmp13_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp12_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp17_ = _tmp16_; + _tmp14_ = _tmp13_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _parent_path_list = _tmp17_; + _parent_path_list = _tmp14_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp18_ = _parent_path_list; + _tmp15_ = _parent_path_list; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _parent_path_size = _tmp20_; + _parent_path_size = _tmp17_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _parent_path_index = -1; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 2693 "TagsBranch.c" - gint _tmp21_; - gint _tmp22_; - gint _tmp23_; +#line 2803 "TagsBranch.c" + gint _tmp18_; + gint _tmp19_; + gint _tmp20_; gchar* parent_path = NULL; - GeeList* _tmp24_; - gint _tmp25_; - gpointer _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; + GeeList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp21_ = _parent_path_index; + _tmp18_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _parent_path_index = _tmp21_ + 1; + _parent_path_index = _tmp18_ + 1; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp22_ = _parent_path_index; + _tmp19_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp23_ = _parent_path_size; + _tmp20_ = _parent_path_size; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (!(_tmp22_ < _tmp23_)) { + if (!(_tmp19_ < _tmp20_)) { #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 2715 "TagsBranch.c" +#line 2825 "TagsBranch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp24_ = _parent_path_list; + _tmp21_ = _parent_path_list; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp25_ = _parent_path_index; + _tmp22_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp26_ = gee_list_get (_tmp24_, _tmp25_); + _tmp23_ = gee_list_get (_tmp21_, _tmp22_); #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - parent_path = (gchar*) _tmp26_; + parent_path = (gchar*) _tmp23_; #line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp27_ = parent_path; + _tmp24_ = parent_path; #line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp28_ = old_tag_path; + _tmp25_ = old_tag_path; #line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (g_strcmp0 (_tmp27_, _tmp28_) == 0) { + if (g_strcmp0 (_tmp24_, _tmp25_) == 0) { #line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2737,73 +2847,71 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2741 "TagsBranch.c" +#line 2851 "TagsBranch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (parent_path); -#line 2745 "TagsBranch.c" +#line 2855 "TagsBranch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_parent_path_list); -#line 2749 "TagsBranch.c" +#line 2859 "TagsBranch.c" } #line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp29_ = tag_global; + _tmp26_ = tag_global; #line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp30_ = old_tag_path; + _tmp27_ = old_tag_path; #line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp31_ = tag_source_collection_exists (_tmp29_, _tmp30_, FALSE); -#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _vala_assert (_tmp31_, "Tag.global.exists(old_tag_path)"); + _vala_assert (tag_source_collection_exists (_tmp26_, _tmp27_, FALSE), "Tag.global.exists(old_tag_path)"); #line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp32_ = old_tag_path; + _tmp28_ = old_tag_path; #line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp33_ = tag_for_path (_tmp32_); + _tmp29_ = tag_for_path (_tmp28_); #line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag = _tmp33_; + old_tag = _tmp29_; #line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp34_ = old_tag; + _tmp30_ = old_tag; #line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp35_ = tag_get_hierarchical_parent (_tmp34_); + _tmp31_ = tag_get_hierarchical_parent (_tmp30_); #line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - old_tag_parent = _tmp35_; + old_tag_parent = _tmp31_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp37_ = old_tag_parent; + _tmp33_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp37_ != NULL) { -#line 2775 "TagsBranch.c" - Tag* _tmp38_; + if (_tmp33_ != NULL) { +#line 2883 "TagsBranch.c" + Tag* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + Tag* _tmp37_; + gchar* _tmp38_; gchar* _tmp39_; - gchar* _tmp40_; - Tag* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp38_ = old_tag_parent; + _tmp34_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp39_ = tag_get_path (_tmp38_); + _tmp35_ = tag_get_path (_tmp34_); #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp40_ = _tmp39_; + _tmp36_ = _tmp35_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp41_ = self->priv->tag; + _tmp37_ = self->priv->tag; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp42_ = tag_get_path (_tmp41_); + _tmp38_ = tag_get_path (_tmp37_); #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp43_ = _tmp42_; + _tmp39_ = _tmp38_; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp36_ = g_strcmp0 (_tmp40_, _tmp43_) == 0; + _tmp32_ = g_strcmp0 (_tmp36_, _tmp39_) == 0; #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp43_); + _g_free0 (_tmp39_); #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp40_); -#line 2800 "TagsBranch.c" + _g_free0 (_tmp36_); +#line 2908 "TagsBranch.c" } else { #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp36_ = FALSE; -#line 2804 "TagsBranch.c" + _tmp32_ = FALSE; +#line 2912 "TagsBranch.c" } #line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - if (_tmp36_) { + if (_tmp32_) { #line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2814,32 +2922,32 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2818 "TagsBranch.c" +#line 2926 "TagsBranch.c" } #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp44_ = app_window_get_command_manager (); + _tmp40_ = app_window_get_command_manager (); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp45_ = _tmp44_; + _tmp41_ = _tmp40_; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp46_ = old_tag; + _tmp42_ = old_tag; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp47_ = self->priv->tag; + _tmp43_ = self->priv->tag; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp48_ = tag_get_path (_tmp47_); + _tmp44_ = tag_get_path (_tmp43_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp49_ = _tmp48_; + _tmp45_ = _tmp44_; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp50_ = reparent_tag_command_new (_tmp46_, _tmp49_); + _tmp46_ = reparent_tag_command_new (_tmp42_, _tmp45_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp51_ = _tmp50_; + _tmp47_ = _tmp46_; #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - command_manager_execute (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_COMMAND, Command)); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp47_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp45_); #line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _command_manager_unref0 (_tmp45_); + _command_manager_unref0 (_tmp41_); #line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; #line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2850,17 +2958,19 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2854 "TagsBranch.c" +#line 2962 "TagsBranch.c" } #line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; #line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2860 "TagsBranch.c" +#line 2968 "TagsBranch.c" } -static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) { +static gboolean +tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) +{ TagsSidebarEntry * self; gboolean result = FALSE; #line 282 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2869,11 +2979,14 @@ static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry result = FALSE; #line 283 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2873 "TagsBranch.c" +#line 2983 "TagsBranch.c" } -static guint8* string_get_data (const gchar* self, int* result_length1) { +static guint8* +string_get_data (const gchar* self, + int* result_length1) +{ guint8* result; guint8* res = NULL; gint res_length1; @@ -2885,84 +2998,83 @@ static guint8* string_get_data (const gchar* self, int* result_length1) { gint _tmp3__length1; guint8* _tmp4_; gint _tmp4__length1; -#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (result_length1) { -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 2917 "TagsBranch.c" +#line 3030 "TagsBranch.c" } -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2923 "TagsBranch.c" +#line 3036 "TagsBranch.c" } -static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) { +static void +tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, + GtkSelectionData* data) +{ TagsSidebarEntry * self; - GtkSelectionData* _tmp0_; - GdkAtom _tmp1_; - Tag* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; - guint8* _tmp6_; - gint _tmp6__length1; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; #line 286 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 286 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (data != NULL); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp0_ = data; + _tmp0_ = self->priv->tag; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp1_ = gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE); + _tmp1_ = tag_get_path (_tmp0_); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp2_ = self->priv->tag; + _tmp2_ = _tmp1_; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp3_ = tag_get_path (_tmp2_); + _tmp3_ = string_get_data (_tmp2_, &_tmp3__length1); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp3_; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp5_ = string_get_data (_tmp4_, &_tmp5__length1); -#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6_ = _tmp5_; -#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _tmp6__length1 = _tmp5__length1; + _tmp4__length1 = _tmp3__length1; #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1); + gtk_selection_data_set (data, gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE), 0, _tmp4_, _tmp4__length1); #line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" - _g_free0 (_tmp4_); -#line 2962 "TagsBranch.c" + _g_free0 (_tmp2_); +#line 3072 "TagsBranch.c" } -static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) { +static void +tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" @@ -2975,60 +3087,72 @@ static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_create_page; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize; -#line 2979 "TagsBranch.c" +#line 3091 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) tags_sidebar_entry_real_is_user_renameable; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) tags_sidebar_entry_real_rename; -#line 2990 "TagsBranch.c" +#line 3104 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) tags_sidebar_entry_real_destroy_source; -#line 2999 "TagsBranch.c" +#line 3115 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_sidebar_entry_real_internal_drop_received; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary; -#line 3010 "TagsBranch.c" +#line 3128 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) tags_sidebar_entry_real_expand_on_select; -#line 3019 "TagsBranch.c" +#line 3139 "TagsBranch.c" } -static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) { +static void +tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) +{ #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data; -#line 3028 "TagsBranch.c" +#line 3150 "TagsBranch.c" } -static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) { +static void +tags_sidebar_entry_instance_init (TagsSidebarEntry * self) +{ gchar* _tmp0_; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self); @@ -3036,11 +3160,13 @@ static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) { _tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG); #line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->single_tag_icon = _tmp0_; -#line 3040 "TagsBranch.c" +#line 3164 "TagsBranch.c" } -static void tags_sidebar_entry_finalize (GObject * obj) { +static void +tags_sidebar_entry_finalize (GObject * obj) +{ TagsSidebarEntry * self; #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); @@ -3050,11 +3176,13 @@ static void tags_sidebar_entry_finalize (GObject * obj) { _g_object_unref0 (self->priv->tag); #line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj); -#line 3054 "TagsBranch.c" +#line 3180 "TagsBranch.c" } -GType tags_sidebar_entry_get_type (void) { +GType +tags_sidebar_entry_get_type (void) +{ static volatile gsize tags_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&tags_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (TagsSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tags_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TagsSidebarEntry), 0, (GInstanceInitFunc) tags_sidebar_entry_instance_init, NULL }; @@ -3076,7 +3204,11 @@ GType tags_sidebar_entry_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3088,7 +3220,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -- cgit v1.2.3