diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/tags | |
parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/tags')
-rw-r--r-- | src/tags/HierarchicalTagIndex.c | 6 | ||||
-rw-r--r-- | src/tags/HierarchicalTagUtilities.c | 10 | ||||
-rw-r--r-- | src/tags/TagsBranch.c (renamed from src/tags/Branch.c) | 1534 | ||||
-rw-r--r-- | src/tags/TagsBranch.vala (renamed from src/tags/Branch.vala) | 2 |
4 files changed, 776 insertions, 776 deletions
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c index c188835..c57a25f 100644 --- a/src/tags/HierarchicalTagIndex.c +++ b/src/tags/HierarchicalTagIndex.c @@ -140,7 +140,7 @@ 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_add65 (gchar** * array, int* length, int* size, gchar* value); +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); @@ -665,7 +665,7 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con } -static void _vala_array_add65 (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" @@ -740,7 +740,7 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp5_ = hierarchical_tag_index_get_path_for_name (self, _tmp4_); #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" - _vala_array_add65 (&_result_, &_result__length1, &__result__size_, _tmp5_); + _vala_array_add68 (&_result_, &_result__length1, &__result__size_, _tmp5_); #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _g_free0 (name); #line 747 "HierarchicalTagIndex.c" diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c index f8cfd5d..2a1695b 100644 --- a/src/tags/HierarchicalTagUtilities.c +++ b/src/tags/HierarchicalTagUtilities.c @@ -1353,7 +1353,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 1356 "HierarchicalTagUtilities.c" - goto __catch57_g_regex_error; + goto __catch63_g_regex_error; } #line 1412 "/usr/share/vala-0.36/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); @@ -1378,7 +1378,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 1381 "HierarchicalTagUtilities.c" - goto __catch57_g_regex_error; + goto __catch63_g_regex_error; } #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); @@ -1404,8 +1404,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* return result; #line 1406 "HierarchicalTagUtilities.c" } - goto __finally57; - __catch57_g_regex_error: + goto __finally63; + __catch63_g_regex_error: { GError* e = NULL; #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -1418,7 +1418,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_error_free0 (e); #line 1420 "HierarchicalTagUtilities.c" } - __finally57: + __finally63: #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" diff --git a/src/tags/Branch.c b/src/tags/TagsBranch.c index 0c02a90..d86b3ac 100644 --- a/src/tags/Branch.c +++ b/src/tags/TagsBranch.c @@ -1,5 +1,5 @@ -/* Branch.c generated by valac 0.36.6, the Vala compiler - * generated from Branch.vala, do not modify */ +/* TagsBranch.c generated by valac 0.36.6, the Vala compiler + * generated from TagsBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. * @@ -725,8 +725,8 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST; enum { TAGS_HEADER_DUMMY_PROPERTY }; -SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, 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); @@ -825,25 +825,25 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify 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/Branch.vala" +#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_on_tags_added_removed ((TagsBranch*) self, added, removed); -#line 831 "Branch.c" +#line 831 "TagsBranch.c" } 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/Branch.vala" +#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_on_tags_altered ((TagsBranch*) self, items); -#line 838 "Branch.c" +#line 838 "TagsBranch.c" } 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/Branch.vala" +#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 847 "Branch.c" +#line 847 "TagsBranch.c" } @@ -856,42 +856,42 @@ TagsBranch* tags_branch_construct (GType object_type) { GeeCollection* _tmp4_; TagSourceCollection* _tmp5_; TagSourceCollection* _tmp6_; -#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = tags_header_new (); -#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = _tmp0_; -#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = (TagsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _tags_branch_comparator_gcompare_func, NULL); -#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp1_); -#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = tag_global; -#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection)); -#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp3_; -#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_branch_on_tags_added_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable), NULL); -#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp4_); -#line 21 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 21 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = tag_global; -#line 21 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 21 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _tags_branch_on_tags_added_removed_data_collection_contents_altered, self, 0); -#line 22 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 22 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = tag_global; -#line 22 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 22 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" 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/Branch.vala" +#line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 888 "Branch.c" +#line 888 "TagsBranch.c" } TagsBranch* tags_branch_new (void) { -#line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_branch_construct (TAGS_TYPE_BRANCH); -#line 895 "Branch.c" +#line 895 "TagsBranch.c" } @@ -900,33 +900,33 @@ TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) { GeeHashMap* _tmp0_; Tag* _tmp1_; gpointer _tmp2_; -#line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 30 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (IS_TAG (tag), NULL); -#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->entry_map; -#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = tag; -#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = (TagsSidebarEntry*) _tmp2_; -#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 918 "Branch.c" +#line 918 "TagsBranch.c" } gboolean tags_branch_is_user_renameable (TagsBranch* self) { gboolean result = FALSE; -#line 34 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 34 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (TAGS_IS_BRANCH (self), FALSE); -#line 35 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 35 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 35 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 35 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 930 "Branch.c" +#line 930 "TagsBranch.c" } @@ -942,63 +942,63 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) { Tag* _tmp7_; gint _tmp8_; gint _tmp9_; -#line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = a; -#line 39 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = b; -#line 39 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp0_ == _tmp1_) { -#line 40 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = 0; -#line 40 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 960 "Branch.c" +#line 960 "TagsBranch.c" } -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = a; -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp3_; -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = b; -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = _tmp6_; -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = tag_compare_names (_tmp4_, _tmp7_); -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = _tmp8_; -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp7_); -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp4_); -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = _tmp9_; -#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 986 "Branch.c" +#line 986 "TagsBranch.c" } 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/Branch.vala" +#line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 995 "Branch.c" +#line 995 "TagsBranch.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self ? g_object_ref (self) : NULL; -#line 1002 "Branch.c" +#line 1002 "TagsBranch.c" } @@ -1006,39 +1006,39 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad Tag* restore_point = NULL; GeeIterable* _tmp0_; GeeIterable* _tmp49_; -#line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail ((added_raw == NULL) || GEE_IS_ITERABLE (added_raw)); -#line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); -#line 51 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 51 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" restore_point = NULL; -#line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = added_raw; -#line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp0_ != NULL) { -#line 1022 "Branch.c" +#line 1022 "TagsBranch.c" GeeSortedSet* added = NULL; GeeTreeSet* _tmp1_; -#line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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); -#line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 1029 "Branch.c" +#line 1029 "TagsBranch.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp2_; GeeIterator* _tmp3_; -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = added_raw; -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = gee_iterable_iterator (_tmp2_); -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _object_it = _tmp3_; -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1042 "Branch.c" +#line 1042 "TagsBranch.c" GeeIterator* _tmp4_; gboolean _tmp5_; DataObject* object = NULL; @@ -1049,57 +1049,57 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad Tag* _tmp9_; GeeSortedSet* _tmp10_; Tag* _tmp11_; -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _object_it; -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (!_tmp5_) { -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1061 "Branch.c" +#line 1061 "TagsBranch.c" } -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _object_it; -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" object = (DataObject*) _tmp7_; -#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = object; -#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TAG, Tag)); -#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tag = _tmp9_; -#line 60 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp10_ = added; -#line 60 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp11_ = tag; -#line 60 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1085 "Branch.c" +#line 1085 "TagsBranch.c" } -#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1089 "Branch.c" +#line 1089 "TagsBranch.c" } { GeeIterator* _tag_it = NULL; GeeSortedSet* _tmp12_; GeeIterator* _tmp13_; -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp12_ = added; -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tag_it = _tmp13_; -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1103 "Branch.c" +#line 1103 "TagsBranch.c" GeeIterator* _tmp14_; gboolean _tmp15_; Tag* tag = NULL; @@ -1119,196 +1119,196 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad Tag* _tmp38_; Tag* _tmp47_; Tag* _tmp48_; -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp14_ = _tag_it; -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp15_ = gee_iterator_next (_tmp14_); -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (!_tmp15_) { -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1131 "Branch.c" +#line 1131 "TagsBranch.c" } -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp16_ = _tag_it; -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp17_ = gee_iterator_get (_tmp16_); -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tag = (Tag*) _tmp17_; -#line 66 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp18_ = tag; -#line 66 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp19_ = tag_get_hierarchical_parent (_tmp18_); -#line 66 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" parent_tag = _tmp19_; -#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1147 "Branch.c" +#line 1147 "TagsBranch.c" Tag* _tmp20_; GeeHashMap* _tmp21_; Tag* _tmp22_; gboolean _tmp23_; Tag* _tmp29_; Tag* _tmp30_; -#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp20_ = parent_tag; -#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (!(_tmp20_ != NULL)) { -#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1160 "Branch.c" +#line 1160 "TagsBranch.c" } -#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp21_ = self->priv->entry_map; -#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp22_ = parent_tag; -#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (!_tmp23_) { -#line 1170 "Branch.c" +#line 1170 "TagsBranch.c" TagsSidebarEntry* parent_entry = NULL; Tag* _tmp24_; TagsSidebarEntry* _tmp25_; GeeHashMap* _tmp26_; Tag* _tmp27_; TagsSidebarEntry* _tmp28_; -#line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp24_ = parent_tag; -#line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp25_ = tags_sidebar_entry_new (_tmp24_); -#line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" parent_entry = _tmp25_; -#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp26_ = self->priv->entry_map; -#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp27_ = parent_tag; -#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp28_ = parent_entry; -#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_entry); -#line 1193 "Branch.c" +#line 1193 "TagsBranch.c" } -#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp29_ = parent_tag; -#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp30_ = tag_get_hierarchical_parent (_tmp29_); -#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); -#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" parent_tag = _tmp30_; -#line 1203 "Branch.c" +#line 1203 "TagsBranch.c" } -#line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp31_ = tag; -#line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp32_ = tags_sidebar_entry_new (_tmp31_); -#line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" entry = _tmp32_; -#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp33_ = self->priv->entry_map; -#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp34_ = tag; -#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp35_ = entry; -#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp36_ = tag; -#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp37_ = tag_get_hierarchical_parent (_tmp36_); -#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); -#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" parent_tag = _tmp37_; -#line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp38_ = parent_tag; -#line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp38_ != NULL) { -#line 1231 "Branch.c" +#line 1231 "TagsBranch.c" TagsSidebarEntry* parent_entry = NULL; GeeHashMap* _tmp39_; Tag* _tmp40_; gpointer _tmp41_; TagsSidebarEntry* _tmp42_; TagsSidebarEntry* _tmp43_; -#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp39_ = self->priv->entry_map; -#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp40_ = parent_tag; -#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" parent_entry = (TagsSidebarEntry*) _tmp41_; -#line 83 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp42_ = parent_entry; -#line 83 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp43_ = entry; -#line 83 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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); -#line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_entry); -#line 1254 "Branch.c" +#line 1254 "TagsBranch.c" } else { SidebarEntry* _tmp44_; SidebarEntry* _tmp45_; TagsSidebarEntry* _tmp46_; -#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp45_ = _tmp44_; -#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp46_ = entry; -#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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); -#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp45_); -#line 1269 "Branch.c" +#line 1269 "TagsBranch.c" } -#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp47_ = tag; -#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp48_ = _g_object_ref0 (_tmp47_); -#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (restore_point); -#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" restore_point = _tmp48_; -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (parent_tag); -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); -#line 1285 "Branch.c" +#line 1285 "TagsBranch.c" } -#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tag_it); -#line 1289 "Branch.c" +#line 1289 "TagsBranch.c" } -#line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (added); -#line 1293 "Branch.c" +#line 1293 "TagsBranch.c" } -#line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp49_ = removed; -#line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp49_ != NULL) { -#line 1299 "Branch.c" +#line 1299 "TagsBranch.c" { GeeIterator* _object_it = NULL; GeeIterable* _tmp50_; GeeIterator* _tmp51_; -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp50_ = removed; -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp51_ = gee_iterable_iterator (_tmp50_); -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _object_it = _tmp51_; -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1312 "Branch.c" +#line 1312 "TagsBranch.c" GeeIterator* _tmp52_; gboolean _tmp53_; DataObject* object = NULL; @@ -1328,81 +1328,81 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad gboolean _tmp64_; gboolean _tmp65_; TagsSidebarEntry* _tmp66_; -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp52_ = _object_it; -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp53_ = gee_iterator_next (_tmp52_); -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (!_tmp53_) { -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1340 "Branch.c" +#line 1340 "TagsBranch.c" } -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp54_ = _object_it; -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp55_ = gee_iterator_get (_tmp54_); -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" object = (DataObject*) _tmp55_; -#line 96 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp56_ = object; -#line 96 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_TAG, Tag)); -#line 96 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tag = _tmp57_; -#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp58_ = self->priv->entry_map; -#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp59_ = tag; -#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" entry = (TagsSidebarEntry*) _tmp60_; -#line 99 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp61_ = entry; -#line 99 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _vala_assert (_tmp61_ != NULL, "entry != null"); -#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp62_ = self->priv->entry_map; -#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp63_ = tag; -#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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); -#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" is_removed = _tmp64_; -#line 102 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp65_ = is_removed; -#line 102 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _vala_assert (_tmp65_, "is_removed"); -#line 104 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp66_ = entry; -#line 104 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1388 "Branch.c" +#line 1388 "TagsBranch.c" } -#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1392 "Branch.c" +#line 1392 "TagsBranch.c" } } -#line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (restore_point); -#line 1397 "Branch.c" +#line 1397 "TagsBranch.c" } static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { -#line 109 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 109 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 1406 "Branch.c" +#line 1406 "TagsBranch.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp0_; @@ -1411,25 +1411,25 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { GeeSet* _tmp3_; GeeIterator* _tmp4_; GeeIterator* _tmp5_; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = altered; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = gee_map_get_keys (_tmp0_); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = _tmp1_; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = _tmp2_; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = _tmp4_; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp3_); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _object_it = _tmp5_; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 1433 "Branch.c" +#line 1433 "TagsBranch.c" GeeIterator* _tmp6_; gboolean _tmp7_; DataObject* object = NULL; @@ -1458,125 +1458,125 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { gchar* _tmp28_; gchar* _tmp29_; TagsSidebarEntry* _tmp30_; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _object_it; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (!_tmp7_) { -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 1470 "Branch.c" +#line 1470 "TagsBranch.c" } -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = _object_it; -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" object = (DataObject*) _tmp9_; -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp10_ = altered; -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp11_ = object; -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp12_ = gee_map_get (_tmp10_, _tmp11_); -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp13_ = (Alteration*) _tmp12_; -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp14_ = alteration_has_detail (_tmp13_, "metadata", "name"); -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp15_ = !_tmp14_; -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _alteration_unref0 (_tmp13_); -#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp15_) { -#line 112 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 112 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" continue; -#line 1498 "Branch.c" +#line 1498 "TagsBranch.c" } -#line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp16_ = object; -#line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_TAG, Tag)); -#line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tag = _tmp17_; -#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp18_ = self->priv->entry_map; -#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp19_ = tag; -#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" entry = (TagsSidebarEntry*) _tmp20_; -#line 116 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp21_ = entry; -#line 116 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _vala_assert (_tmp21_ != NULL, "entry != null"); -#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp22_ = entry; -#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp23_ = tag; -#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp24_ = tag_get_user_visible_name (_tmp23_); -#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp25_ = _tmp24_; -#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp25_); -#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp26_ = entry; -#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp27_ = tag; -#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp28_ = tag_get_user_visible_name (_tmp27_); -#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp29_ = _tmp28_; -#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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_); -#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp29_); -#line 120 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 120 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp30_ = entry; -#line 120 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (entry); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (tag); -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (object); -#line 1552 "Branch.c" +#line 1552 "TagsBranch.c" } -#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_object_it); -#line 1556 "Branch.c" +#line 1556 "TagsBranch.c" } } static void tags_branch_class_init (TagsBranchClass * klass) { -#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_branch_finalize; -#line 1568 "Branch.c" +#line 1568 "TagsBranch.c" } static void tags_branch_instance_init (TagsBranch * self) { GeeHashMap* _tmp0_; -#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_BRANCH_GET_PRIVATE (self); -#line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _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/Branch.vala" +#line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->entry_map = _tmp0_; -#line 1580 "Branch.c" +#line 1580 "TagsBranch.c" } @@ -1586,25 +1586,25 @@ static void tags_branch_finalize (GObject * obj) { guint _tmp1_; TagSourceCollection* _tmp2_; guint _tmp3_; -#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_BRANCH, TagsBranch); -#line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = tag_global; -#line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE); -#line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _tags_branch_on_tags_added_removed_data_collection_contents_altered, self); -#line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = tag_global; -#line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); -#line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _tags_branch_on_tags_altered_data_collection_items_altered, self); -#line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->entry_map); -#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_branch_parent_class)->finalize (obj); -#line 1608 "Branch.c" +#line 1608 "TagsBranch.c" } @@ -1622,35 +1622,35 @@ GType tags_branch_get_type (void) { TagsHeader* tags_header_construct (GType object_type) { TagsHeader * self = NULL; -#line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala" - self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), TRUE); -#line 132 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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); +#line 132 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" tags_header_setup_context_menu (self); -#line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 1632 "Branch.c" +#line 1632 "TagsBranch.c" } TagsHeader* tags_header_new (void) { -#line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_header_construct (TAGS_TYPE_HEADER); -#line 1639 "Branch.c" +#line 1639 "TagsBranch.c" } static void tags_header_setup_context_menu (TagsHeader* self) { GtkBuilder* _tmp0_; GError * _inner_error_ = NULL; -#line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 135 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (TAGS_IS_HEADER (self)); -#line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = gtk_builder_new (); -#line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->builder); -#line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->builder = _tmp0_; -#line 1654 "Branch.c" +#line 1654 "TagsBranch.c" { GtkBuilder* _tmp1_; gchar* _tmp2_; @@ -1661,45 +1661,45 @@ static void tags_header_setup_context_menu (TagsHeader* self) { GMenuModel* _tmp6_; GMenuModel* _tmp7_; GtkMenu* _tmp8_; -#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = self->priv->builder; -#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = resources_get_ui ("tag_sidebar_context.ui"); -#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = _tmp2_; -#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_); -#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp3_); -#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1677 "Branch.c" - goto __catch55_g_error; +#line 1677 "TagsBranch.c" + goto __catch61_g_error; } -#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = self->priv->builder; -#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu"); -#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp5_) : NULL); -#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" model = _tmp6_; -#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = model; -#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_); -#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_object_ref_sink (_tmp8_); -#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->context_menu); -#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->context_menu = _tmp8_; -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (model); -#line 1700 "Branch.c" +#line 1700 "TagsBranch.c" } - goto __finally55; - __catch55_g_error: + goto __finally61; + __catch61_g_error: { GError* _error_ = NULL; GError* _tmp9_; @@ -1708,44 +1708,44 @@ static void tags_header_setup_context_menu (TagsHeader* self) { gchar* _tmp12_; Application* _tmp13_; Application* _tmp14_; -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _error_ = _inner_error_; -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _inner_error_ = NULL; -#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = _error_; -#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp10_ = _tmp9_->message; -#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_); -#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp12_ = _tmp11_; -#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" app_window_error_message (_tmp12_, NULL); -#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp12_); -#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp13_ = application_get_instance (); -#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp14_ = _tmp13_; -#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" application_panic (_tmp14_); -#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _application_unref0 (_tmp14_); -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_error_free0 (_error_); -#line 1738 "Branch.c" +#line 1738 "TagsBranch.c" } - __finally55: -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" + __finally61: +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_clear_error (&_inner_error_); -#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 1749 "Branch.c" +#line 1749 "TagsBranch.c" } } @@ -1771,85 +1771,85 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg GeeList* _tmp10_; AddTagsCommand* _tmp11_; AddTagsCommand* _tmp12_; -#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 148 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (GEE_IS_LIST (media), FALSE); -#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 149 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = add_tags_dialog_new (); -#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 149 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" dialog = _tmp0_; -#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = dialog; -#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_); -#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" names = _tmp3_; -#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" names_length1 = _tmp2_; -#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _names_size_ = names_length1; -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = names; -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5__length1 = names_length1; -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp5_ == NULL) { -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = TRUE; -#line 1801 "Branch.c" +#line 1801 "TagsBranch.c" } else { gchar** _tmp6_; gint _tmp6__length1; -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = names; -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6__length1 = names_length1; -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp6__length1 == 0; -#line 1811 "Branch.c" +#line 1811 "TagsBranch.c" } -#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp4_) { -#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; -#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); -#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1823 "Branch.c" +#line 1823 "TagsBranch.c" } -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = app_window_get_command_manager (); -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = _tmp7_; -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = names; -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9__length1 = names_length1; -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp10_ = media; -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp12_ = _tmp11_; -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp12_); -#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp8_); -#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL); -#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _text_entry_dialog_mediator_unref0 (dialog); -#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1853 "Branch.c" +#line 1853 "TagsBranch.c" } @@ -1861,25 +1861,25 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern gchar* _tmp2_; gchar* _tmp3_; gboolean _tmp4_; -#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = data; -#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = gdk_atom_name (_tmp1_); -#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = _tmp2_; -#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; -#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp3_); -#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp4_) { -#line 1883 "Branch.c" +#line 1883 "TagsBranch.c" gchar* old_tag_path = NULL; GtkSelectionData* _tmp5_; guchar* _tmp6_; @@ -1900,91 +1900,91 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern Tag* _tmp21_; ReparentTagCommand* _tmp22_; ReparentTagCommand* _tmp23_; -#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = data; -#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = gtk_selection_data_get_data (_tmp5_); -#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = g_strdup ((const gchar*) _tmp6_); -#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" old_tag_path = _tmp7_; -#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = tag_global; -#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = old_tag_path; -#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _vala_assert (_tmp10_, "Tag.global.exists(old_tag_path)"); -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp11_ = old_tag_path; -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp13_ = _tmp12_; -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp15_ = _tmp14_; -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp16_ = _tmp15_ < 2; -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp13_); -#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp16_) { -#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); -#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1942 "Branch.c" +#line 1942 "TagsBranch.c" } -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp17_ = app_window_get_command_manager (); -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp18_ = _tmp17_; -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp19_ = old_tag_path; -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp20_ = tag_for_path (_tmp19_); -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp21_ = _tmp20_; -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp22_ = reparent_tag_command_new (_tmp21_, "/"); -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp23_ = _tmp22_; -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp23_); -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp21_); -#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp18_); -#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); -#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1972 "Branch.c" +#line 1972 "TagsBranch.c" } -#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; -#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 1978 "Branch.c" +#line 1978 "TagsBranch.c" } static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) { TagsHeader * self; -#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 177 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (data != NULL); -#line 1988 "Branch.c" +#line 1988 "TagsBranch.c" } @@ -1993,80 +1993,80 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b GtkMenu* result = NULL; GtkMenu* _tmp0_; GtkMenu* _tmp1_; -#line 181 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 181 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); -#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->context_menu; -#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = _tmp1_; -#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2007 "Branch.c" +#line 2007 "TagsBranch.c" } static void tags_header_class_init (TagsHeaderClass * klass) { -#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_header_finalize; -#line 2018 "Branch.c" +#line 2018 "TagsBranch.c" } static void tags_header_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { -#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#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 "Branch.c" +#line 2029 "TagsBranch.c" } static void tags_header_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) { -#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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 "Branch.c" +#line 2038 "TagsBranch.c" } static void tags_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) { -#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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 "Branch.c" +#line 2047 "TagsBranch.c" } static void tags_header_instance_init (TagsHeader * self) { -#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 128 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->context_menu = NULL; -#line 2056 "Branch.c" +#line 2056 "TagsBranch.c" } static void tags_header_finalize (GObject * obj) { TagsHeader * self; -#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader); -#line 127 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 127 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->builder); -#line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 128 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->context_menu); -#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj); -#line 2070 "Branch.c" +#line 2070 "TagsBranch.c" } @@ -2092,28 +2092,28 @@ 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/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = tag; -#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->tag); -#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->tag = _tmp1_; -#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return self; -#line 2110 "Branch.c" +#line 2110 "TagsBranch.c" } TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) { -#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag); -#line 2117 "Branch.c" +#line 2117 "TagsBranch.c" } @@ -2129,17 +2129,17 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { Tag* result = NULL; Tag* _tmp0_; Tag* _tmp1_; -#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 203 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL); -#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->tag; -#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = _tmp1_; -#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2143 "Branch.c" +#line 2143 "TagsBranch.c" } @@ -2148,17 +2148,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* gchar* result = NULL; Tag* _tmp0_; gchar* _tmp1_; -#line 207 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 207 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); -#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->tag; -#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = tag_get_user_visible_name (_tmp0_); -#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = _tmp1_; -#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2162 "Branch.c" +#line 2162 "TagsBranch.c" } @@ -2167,17 +2167,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; -#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 211 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); -#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->single_tag_icon; -#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = g_strdup (_tmp0_); -#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = _tmp1_; -#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2181 "Branch.c" +#line 2181 "TagsBranch.c" } @@ -2186,32 +2186,32 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) Page* result = NULL; Tag* _tmp0_; TagPage* _tmp1_; -#line 215 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 215 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); -#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->tag; -#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = tag_page_new (_tmp0_); -#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_object_ref_sink (_tmp1_); -#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); -#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2202 "Branch.c" +#line 2202 "TagsBranch.c" } static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) { TagsSidebarEntry * self; gboolean result = FALSE; -#line 219 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 219 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); -#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 220 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 220 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2215 "Branch.c" +#line 2215 "TagsBranch.c" } @@ -2230,20 +2230,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if ((*((gchar*) self)) == '\0') { #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 2234 "Branch.c" +#line 2234 "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 "Branch.c" +#line 2241 "TagsBranch.c" } #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 2247 "Branch.c" +#line 2247 "TagsBranch.c" } else { const gchar* _tmp3_; const gchar* _tmp4_; @@ -2253,11 +2253,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _tmp4_ = replacement; #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 2257 "Branch.c" +#line 2257 "TagsBranch.c" } #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 2261 "Branch.c" +#line 2261 "TagsBranch.c" gchar* _tmp5_; #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = g_strdup (self); @@ -2265,7 +2265,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* result = _tmp5_; #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2269 "Branch.c" +#line 2269 "TagsBranch.c" } { GRegex* regex = NULL; @@ -2297,8 +2297,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2301 "Branch.c" - goto __catch56_g_regex_error; +#line 2301 "TagsBranch.c" + goto __catch62_g_regex_error; } #line 1412 "/usr/share/vala-0.36/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); @@ -2306,7 +2306,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2310 "Branch.c" +#line 2310 "TagsBranch.c" } #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = regex; @@ -2322,8 +2322,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2326 "Branch.c" - goto __catch56_g_regex_error; +#line 2326 "TagsBranch.c" + goto __catch62_g_regex_error; } #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); @@ -2333,7 +2333,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2337 "Branch.c" +#line 2337 "TagsBranch.c" } #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = _tmp11_; @@ -2347,10 +2347,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2351 "Branch.c" +#line 2351 "TagsBranch.c" } - goto __finally56; - __catch56_g_regex_error: + goto __finally62; + __catch62_g_regex_error: { GError* e = NULL; #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -2361,9 +2361,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_assert_not_reached (); #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2365 "Branch.c" +#line 2365 "TagsBranch.c" } - __finally56: + __finally62: #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -2372,7 +2372,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2376 "Branch.c" +#line 2376 "TagsBranch.c" } } @@ -2397,85 +2397,85 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const const gchar* _tmp14_; RenameTagCommand* _tmp15_; RenameTagCommand* _tmp16_; -#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = new_name; -#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = tag_prep_tag_name (_tmp0_); -#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" prepped = _tmp1_; -#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = prepped; -#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp2_ == NULL) { -#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); -#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2419 "Branch.c" +#line 2419 "TagsBranch.c" } -#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = prepped; -#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = string_replace (_tmp3_, "/", ""); -#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); -#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" prepped = _tmp4_; -#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = prepped; -#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = self->priv->tag; -#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = tag_get_user_visible_name (_tmp6_); -#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = _tmp7_; -#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0; -#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp8_); -#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp9_) { -#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); -#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2447 "Branch.c" +#line 2447 "TagsBranch.c" } -#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp10_ = prepped; -#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (g_strcmp0 (_tmp10_, "") == 0) { -#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); -#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return; -#line 2457 "Branch.c" +#line 2457 "TagsBranch.c" } -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp11_ = app_window_get_command_manager (); -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp12_ = _tmp11_; -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp13_ = self->priv->tag; -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp14_ = prepped; -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp15_ = rename_tag_command_new (_tmp13_, _tmp14_); -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp16_ = _tmp15_; -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp16_); -#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp12_); -#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (prepped); -#line 2479 "Branch.c" +#line 2479 "TagsBranch.c" } @@ -2483,37 +2483,37 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas TagsSidebarEntry * self; Tag* _tmp0_; gboolean _tmp1_; -#line 239 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = self->priv->tag; -#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); -#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp1_) { -#line 2495 "Branch.c" +#line 2495 "TagsBranch.c" CommandManager* _tmp2_; CommandManager* _tmp3_; Tag* _tmp4_; DeleteTagCommand* _tmp5_; DeleteTagCommand* _tmp6_; -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = app_window_get_command_manager (); -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = _tmp2_; -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = self->priv->tag; -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = delete_tag_command_new (_tmp4_); -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _tmp5_; -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp6_); -#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp3_); -#line 2517 "Branch.c" +#line 2517 "TagsBranch.c" } } @@ -2530,39 +2530,39 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD gint _tmp6_; TagUntagPhotosCommand* _tmp7_; TagUntagPhotosCommand* _tmp8_; -#line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 244 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_val_if_fail (GEE_IS_LIST (media), FALSE); -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = app_window_get_command_manager (); -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = _tmp0_; -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = self->priv->tag; -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = media; -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = media; -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _tmp5_; -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = _tmp7_; -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp8_); -#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp1_); -#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2566 "Branch.c" +#line 2566 "TagsBranch.c" } @@ -2574,25 +2574,25 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba gchar* _tmp2_; gchar* _tmp3_; gboolean _tmp4_; -#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = data; -#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = gtk_selection_data_get_data_type (_tmp0_); -#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = gdk_atom_name (_tmp1_); -#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = _tmp2_; -#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; -#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp3_); -#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp4_) { -#line 2596 "Branch.c" +#line 2596 "TagsBranch.c" gchar* old_tag_path = NULL; GtkSelectionData* _tmp5_; guchar* _tmp6_; @@ -2621,35 +2621,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba gchar* _tmp49_; ReparentTagCommand* _tmp50_; ReparentTagCommand* _tmp51_; -#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp5_ = data; -#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = gtk_selection_data_get_data (_tmp5_); -#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp7_ = g_strdup ((const gchar*) _tmp6_); -#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" old_tag_path = _tmp7_; -#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp8_ = old_tag_path; -#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp9_ = self->priv->tag; -#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp10_ = tag_get_path (_tmp9_); -#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp11_ = _tmp10_; -#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp12_ = g_strcmp0 (_tmp8_, _tmp11_) == 0; -#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp11_); -#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp12_) { -#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); -#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2653 "Branch.c" +#line 2653 "TagsBranch.c" } { GeeList* _parent_path_list = NULL; @@ -2663,33 +2663,33 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba gint _tmp19_; gint _tmp20_; gint _parent_path_index = 0; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp13_ = self->priv->tag; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp14_ = tag_get_path (_tmp13_); -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp15_ = _tmp14_; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_); -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp17_ = _tmp16_; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp15_); -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _parent_path_list = _tmp17_; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp18_ = _parent_path_list; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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)); -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp20_ = _tmp19_; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _parent_path_size = _tmp20_; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _parent_path_index = -1; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" while (TRUE) { -#line 2693 "Branch.c" +#line 2693 "TagsBranch.c" gint _tmp21_; gint _tmp22_; gint _tmp23_; @@ -2699,177 +2699,177 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba gpointer _tmp26_; const gchar* _tmp27_; const gchar* _tmp28_; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp21_ = _parent_path_index; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _parent_path_index = _tmp21_ + 1; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp22_ = _parent_path_index; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp23_ = _parent_path_size; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (!(_tmp22_ < _tmp23_)) { -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" break; -#line 2715 "Branch.c" +#line 2715 "TagsBranch.c" } -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp24_ = _parent_path_list; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp25_ = _parent_path_index; -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp26_ = gee_list_get (_tmp24_, _tmp25_); -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" parent_path = (gchar*) _tmp26_; -#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp27_ = parent_path; -#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp28_ = old_tag_path; -#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (g_strcmp0 (_tmp27_, _tmp28_) == 0) { -#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (parent_path); -#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_parent_path_list); -#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); -#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2741 "Branch.c" +#line 2741 "TagsBranch.c" } -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (parent_path); -#line 2745 "Branch.c" +#line 2745 "TagsBranch.c" } -#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_parent_path_list); -#line 2749 "Branch.c" +#line 2749 "TagsBranch.c" } -#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp29_ = tag_global; -#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp30_ = old_tag_path; -#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _vala_assert (_tmp31_, "Tag.global.exists(old_tag_path)"); -#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp32_ = old_tag_path; -#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp33_ = tag_for_path (_tmp32_); -#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" old_tag = _tmp33_; -#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp34_ = old_tag; -#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp35_ = tag_get_hierarchical_parent (_tmp34_); -#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" old_tag_parent = _tmp35_; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp37_ = old_tag_parent; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp37_ != NULL) { -#line 2775 "Branch.c" +#line 2775 "TagsBranch.c" Tag* _tmp38_; gchar* _tmp39_; gchar* _tmp40_; Tag* _tmp41_; gchar* _tmp42_; gchar* _tmp43_; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp38_ = old_tag_parent; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp39_ = tag_get_path (_tmp38_); -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp40_ = _tmp39_; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp41_ = self->priv->tag; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp42_ = tag_get_path (_tmp41_); -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp43_ = _tmp42_; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp36_ = g_strcmp0 (_tmp40_, _tmp43_) == 0; -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp43_); -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp40_); -#line 2800 "Branch.c" +#line 2800 "TagsBranch.c" } else { -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp36_ = FALSE; -#line 2804 "Branch.c" +#line 2804 "TagsBranch.c" } -#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" if (_tmp36_) { -#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (old_tag_parent); -#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (old_tag); -#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); -#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2818 "Branch.c" +#line 2818 "TagsBranch.c" } -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp44_ = app_window_get_command_manager (); -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp45_ = _tmp44_; -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp46_ = old_tag; -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp47_ = self->priv->tag; -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp48_ = tag_get_path (_tmp47_); -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp49_ = _tmp48_; -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp50_ = reparent_tag_command_new (_tmp46_, _tmp49_); -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp51_ = _tmp50_; -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" command_manager_execute (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command)); -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (_tmp51_); -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp49_); -#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _command_manager_unref0 (_tmp45_); -#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = TRUE; -#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (old_tag_parent); -#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (old_tag); -#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (old_tag_path); -#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2854 "Branch.c" +#line 2854 "TagsBranch.c" } -#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; -#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2860 "Branch.c" +#line 2860 "TagsBranch.c" } static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) { TagsSidebarEntry * self; gboolean result = FALSE; -#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 282 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); -#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 283 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" result = FALSE; -#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 283 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" return result; -#line 2873 "Branch.c" +#line 2873 "TagsBranch.c" } @@ -2913,13 +2913,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) { if (result_length1) { #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 2917 "Branch.c" +#line 2917 "TagsBranch.c" } #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2923 "Branch.c" +#line 2923 "TagsBranch.c" } @@ -2934,123 +2934,123 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS gint _tmp5__length1; guint8* _tmp6_; gint _tmp6__length1; -#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 286 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_return_if_fail (data != NULL); -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = data; -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp1_ = gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE); -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp2_ = self->priv->tag; -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp3_ = tag_get_path (_tmp2_); -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp4_ = _tmp3_; -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6_ = _tmp5_; -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp6__length1 = _tmp5__length1; -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1); -#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (_tmp4_); -#line 2962 "Branch.c" +#line 2962 "TagsBranch.c" } static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) { -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate)); -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_name; -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_icon; -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_create_page; -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize; -#line 2979 "Branch.c" +#line 2979 "TagsBranch.c" } static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) { -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) tags_sidebar_entry_real_rename; -#line 2990 "Branch.c" +#line 2990 "TagsBranch.c" } static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) { -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) tags_sidebar_entry_real_destroy_source; -#line 2999 "Branch.c" +#line 2999 "TagsBranch.c" } static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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/Branch.vala" +#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 "Branch.c" +#line 3010 "TagsBranch.c" } static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) { -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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 "Branch.c" +#line 3019 "TagsBranch.c" } static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) { -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#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/Branch.vala" +#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 "Branch.c" +#line 3028 "TagsBranch.c" } static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) { gchar* _tmp0_; -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self); -#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG); -#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self->priv->single_tag_icon = _tmp0_; -#line 3040 "Branch.c" +#line 3040 "TagsBranch.c" } static void tags_sidebar_entry_finalize (GObject * obj) { TagsSidebarEntry * self; -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); -#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_free0 (self->priv->single_tag_icon); -#line 191 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 191 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" _g_object_unref0 (self->priv->tag); -#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" +#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala" G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj); -#line 3054 "Branch.c" +#line 3054 "TagsBranch.c" } diff --git a/src/tags/Branch.vala b/src/tags/TagsBranch.vala index 52dabdb..e11ea5d 100644 --- a/src/tags/Branch.vala +++ b/src/tags/TagsBranch.vala @@ -128,7 +128,7 @@ public class Tags.Header : Sidebar.Header, Sidebar.InternalDropTargetEntry, private Gtk.Menu? context_menu = null; public Header() { - base (_("Tags")); + base (_("Tags"), _("Organize and browse your photo’s tags")); setup_context_menu(); } |