From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/tags/Branch.c | 1013 ++++++++++++++------------- src/tags/HierarchicalTagIndex.c | 210 +++--- src/tags/HierarchicalTagUtilities.c | 1316 ++++++++++++++++++----------------- src/tags/TagPage.c | 238 +++---- src/tags/Tags.c | 2 +- 5 files changed, 1430 insertions(+), 1349 deletions(-) (limited to 'src/tags') diff --git a/src/tags/Branch.c b/src/tags/Branch.c index 9bad2d8..0c02a90 100644 --- a/src/tags/Branch.c +++ b/src/tags/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.7, the Vala compiler +/* Branch.c generated by valac 0.36.6, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -640,15 +640,15 @@ struct _TagsSidebarEntryPrivate { static gpointer tags_branch_parent_class = NULL; extern TagSourceCollection* tag_global; static gpointer tags_header_parent_class = NULL; -static SidebarInternalDropTargetEntryIface* tags_header_sidebar_internal_drop_target_entry_parent_iface = NULL; -static SidebarInternalDragSourceEntryIface* tags_header_sidebar_internal_drag_source_entry_parent_iface = NULL; -static SidebarContextableIface* tags_header_sidebar_contextable_parent_iface = NULL; +static SidebarInternalDropTargetEntryIface * tags_header_sidebar_internal_drop_target_entry_parent_iface = NULL; +static SidebarInternalDragSourceEntryIface * tags_header_sidebar_internal_drag_source_entry_parent_iface = NULL; +static SidebarContextableIface * tags_header_sidebar_contextable_parent_iface = NULL; static gpointer tags_sidebar_entry_parent_class = NULL; -static SidebarRenameableEntryIface* tags_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL; -static SidebarDestroyableEntryIface* tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL; -static SidebarInternalDropTargetEntryIface* tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; -static SidebarExpandableEntryIface* tags_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL; -static SidebarInternalDragSourceEntryIface* tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = NULL; +static SidebarRenameableEntryIface * tags_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL; +static SidebarDestroyableEntryIface * tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL; +static SidebarInternalDropTargetEntryIface * tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; +static SidebarExpandableEntryIface * tags_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL; +static SidebarInternalDragSourceEntryIface * tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = NULL; GType sidebar_branch_get_type (void) G_GNUC_CONST; GType tags_branch_get_type (void) G_GNUC_CONST; @@ -713,7 +713,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; gchar* tag_get_user_visible_name (Tag* self); void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry); -static void tags_branch_finalize (GObject* obj); +static void tags_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -776,7 +776,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, GType reparent_tag_command_get_type (void) G_GNUC_CONST; static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event); -static void tags_header_finalize (GObject* obj); +static void tags_header_finalize (GObject * obj); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; @@ -819,7 +819,7 @@ gchar* tag_get_path (Tag* self); GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base); static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); -static void tags_sidebar_entry_finalize (GObject* obj); +static void tags_sidebar_entry_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -849,13 +849,13 @@ static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointe TagsBranch* tags_branch_construct (GType object_type) { TagsBranch * self = NULL; - TagsHeader* _tmp0_ = NULL; - TagsHeader* _tmp1_ = NULL; - TagSourceCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - TagSourceCollection* _tmp5_ = NULL; - TagSourceCollection* _tmp6_ = NULL; + TagsHeader* _tmp0_; + TagsHeader* _tmp1_; + TagSourceCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + TagSourceCollection* _tmp5_; + TagSourceCollection* _tmp6_; #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp0_ = tags_header_new (); #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -897,9 +897,9 @@ TagsBranch* tags_branch_new (void) { TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) { TagsSidebarEntry* result = NULL; - GeeHashMap* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + Tag* _tmp1_; + gpointer _tmp2_; #line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (TAGS_IS_BRANCH (self), NULL); #line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -932,16 +932,16 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) { static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - Tag* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - Tag* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; + Tag* _tmp3_; + Tag* _tmp4_; + SidebarEntry* _tmp5_; + Tag* _tmp6_; + Tag* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1004,8 +1004,8 @@ static gpointer _g_object_ref0 (gpointer self) { static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* added_raw, GeeIterable* removed) { Tag* restore_point = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterable* _tmp49_ = NULL; + GeeIterable* _tmp0_; + GeeIterable* _tmp49_; #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_if_fail (TAGS_IS_BRANCH (self)); #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1020,7 +1020,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad if (_tmp0_ != NULL) { #line 1022 "Branch.c" GeeSortedSet* added = NULL; - GeeTreeSet* _tmp1_ = NULL; + GeeTreeSet* _tmp1_; #line 57 "/home/jens/Source/shotwell/src/tags/Branch.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" @@ -1028,8 +1028,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 1029 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; + GeeIterable* _tmp2_; + GeeIterator* _tmp3_; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp2_ = added_raw; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1039,16 +1039,16 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1042 "Branch.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GeeIterator* _tmp4_; + gboolean _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; + GeeIterator* _tmp6_; + gpointer _tmp7_; Tag* tag = NULL; - DataObject* _tmp8_ = NULL; - Tag* _tmp9_ = NULL; - GeeSortedSet* _tmp10_ = NULL; - Tag* _tmp11_ = NULL; + DataObject* _tmp8_; + Tag* _tmp9_; + GeeSortedSet* _tmp10_; + Tag* _tmp11_; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1089,8 +1089,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad } { GeeIterator* _tag_it = NULL; - GeeSortedSet* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; + GeeSortedSet* _tmp12_; + GeeIterator* _tmp13_; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp12_ = added; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1100,25 +1100,25 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1103 "Branch.c" - GeeIterator* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GeeIterator* _tmp14_; + gboolean _tmp15_; Tag* tag = NULL; - GeeIterator* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; + GeeIterator* _tmp16_; + gpointer _tmp17_; Tag* parent_tag = NULL; - Tag* _tmp18_ = NULL; - Tag* _tmp19_ = NULL; + Tag* _tmp18_; + Tag* _tmp19_; TagsSidebarEntry* entry = NULL; - Tag* _tmp31_ = NULL; - TagsSidebarEntry* _tmp32_ = NULL; - GeeHashMap* _tmp33_ = NULL; - Tag* _tmp34_ = NULL; - TagsSidebarEntry* _tmp35_ = NULL; - Tag* _tmp36_ = NULL; - Tag* _tmp37_ = NULL; - Tag* _tmp38_ = NULL; - Tag* _tmp47_ = NULL; - Tag* _tmp48_ = NULL; + Tag* _tmp31_; + TagsSidebarEntry* _tmp32_; + GeeHashMap* _tmp33_; + Tag* _tmp34_; + TagsSidebarEntry* _tmp35_; + Tag* _tmp36_; + Tag* _tmp37_; + Tag* _tmp38_; + Tag* _tmp47_; + Tag* _tmp48_; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp14_ = _tag_it; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1144,12 +1144,12 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1147 "Branch.c" - Tag* _tmp20_ = NULL; - GeeHashMap* _tmp21_ = NULL; - Tag* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - Tag* _tmp29_ = NULL; - Tag* _tmp30_ = NULL; + Tag* _tmp20_; + GeeHashMap* _tmp21_; + Tag* _tmp22_; + gboolean _tmp23_; + Tag* _tmp29_; + Tag* _tmp30_; #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp20_ = parent_tag; #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1168,11 +1168,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad if (!_tmp23_) { #line 1170 "Branch.c" TagsSidebarEntry* parent_entry = NULL; - Tag* _tmp24_ = NULL; - TagsSidebarEntry* _tmp25_ = NULL; - GeeHashMap* _tmp26_ = NULL; - Tag* _tmp27_ = NULL; - TagsSidebarEntry* _tmp28_ = NULL; + Tag* _tmp24_; + TagsSidebarEntry* _tmp25_; + GeeHashMap* _tmp26_; + Tag* _tmp27_; + TagsSidebarEntry* _tmp28_; #line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp24_ = parent_tag; #line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1229,11 +1229,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad if (_tmp38_ != NULL) { #line 1231 "Branch.c" TagsSidebarEntry* parent_entry = NULL; - GeeHashMap* _tmp39_ = NULL; - Tag* _tmp40_ = NULL; - gpointer _tmp41_ = NULL; - TagsSidebarEntry* _tmp42_ = NULL; - TagsSidebarEntry* _tmp43_ = NULL; + GeeHashMap* _tmp39_; + Tag* _tmp40_; + gpointer _tmp41_; + TagsSidebarEntry* _tmp42_; + TagsSidebarEntry* _tmp43_; #line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp39_ = self->priv->entry_map; #line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1252,9 +1252,9 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad _g_object_unref0 (parent_entry); #line 1254 "Branch.c" } else { - SidebarEntry* _tmp44_ = NULL; - SidebarEntry* _tmp45_ = NULL; - TagsSidebarEntry* _tmp46_ = NULL; + SidebarEntry* _tmp44_; + SidebarEntry* _tmp45_; + TagsSidebarEntry* _tmp46_; #line 85 "/home/jens/Source/shotwell/src/tags/Branch.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" @@ -1298,8 +1298,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 1299 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp50_ = NULL; - GeeIterator* _tmp51_ = NULL; + GeeIterable* _tmp50_; + GeeIterator* _tmp51_; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp50_ = removed; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1309,25 +1309,25 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1312 "Branch.c" - GeeIterator* _tmp52_ = NULL; - gboolean _tmp53_ = FALSE; + GeeIterator* _tmp52_; + gboolean _tmp53_; DataObject* object = NULL; - GeeIterator* _tmp54_ = NULL; - gpointer _tmp55_ = NULL; + GeeIterator* _tmp54_; + gpointer _tmp55_; Tag* tag = NULL; - DataObject* _tmp56_ = NULL; - Tag* _tmp57_ = NULL; + DataObject* _tmp56_; + Tag* _tmp57_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp58_ = NULL; - Tag* _tmp59_ = NULL; - gpointer _tmp60_ = NULL; - TagsSidebarEntry* _tmp61_ = NULL; + GeeHashMap* _tmp58_; + Tag* _tmp59_; + gpointer _tmp60_; + TagsSidebarEntry* _tmp61_; gboolean is_removed = FALSE; - GeeHashMap* _tmp62_ = NULL; - Tag* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; - gboolean _tmp65_ = FALSE; - TagsSidebarEntry* _tmp66_ = NULL; + GeeHashMap* _tmp62_; + Tag* _tmp63_; + gboolean _tmp64_; + gboolean _tmp65_; + TagsSidebarEntry* _tmp66_; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp52_ = _object_it; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1405,12 +1405,12 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { #line 1406 "Branch.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp0_ = altered; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1430,34 +1430,34 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1433 "Branch.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GeeMap* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - Alteration* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; + GeeIterator* _tmp8_; + gpointer _tmp9_; + GeeMap* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; + Alteration* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; Tag* tag = NULL; - DataObject* _tmp16_ = NULL; - Tag* _tmp17_ = NULL; + DataObject* _tmp16_; + Tag* _tmp17_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp18_ = NULL; - Tag* _tmp19_ = NULL; - gpointer _tmp20_ = NULL; - TagsSidebarEntry* _tmp21_ = NULL; - TagsSidebarEntry* _tmp22_ = NULL; - Tag* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - TagsSidebarEntry* _tmp26_ = NULL; - Tag* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - TagsSidebarEntry* _tmp30_ = NULL; + GeeHashMap* _tmp18_; + Tag* _tmp19_; + gpointer _tmp20_; + TagsSidebarEntry* _tmp21_; + TagsSidebarEntry* _tmp22_; + Tag* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + TagsSidebarEntry* _tmp26_; + Tag* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + TagsSidebarEntry* _tmp30_; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp6_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1569,7 +1569,7 @@ static void tags_branch_class_init (TagsBranchClass * klass) { static void tags_branch_instance_init (TagsBranch * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv = TAGS_BRANCH_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1580,12 +1580,12 @@ static void tags_branch_instance_init (TagsBranch * self) { } -static void tags_branch_finalize (GObject* obj) { +static void tags_branch_finalize (GObject * obj) { TagsBranch * self; - TagSourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; - TagSourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; + TagSourceCollection* _tmp0_; + guint _tmp1_; + TagSourceCollection* _tmp2_; + guint _tmp3_; #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_BRANCH, TagsBranch); #line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1622,28 +1622,25 @@ GType tags_branch_get_type (void) { TagsHeader* tags_header_construct (GType object_type) { TagsHeader * self = NULL; - const gchar* _tmp0_ = NULL; #line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala" - _tmp0_ = _ ("Tags"); -#line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala" - self = (TagsHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE); + self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), TRUE); #line 132 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_header_setup_context_menu (self); #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala" return self; -#line 1635 "Branch.c" +#line 1632 "Branch.c" } TagsHeader* tags_header_new (void) { #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala" return tags_header_construct (TAGS_TYPE_HEADER); -#line 1642 "Branch.c" +#line 1639 "Branch.c" } static void tags_header_setup_context_menu (TagsHeader* self) { - GtkBuilder* _tmp0_ = NULL; + GtkBuilder* _tmp0_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_if_fail (TAGS_IS_HEADER (self)); @@ -1653,17 +1650,17 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_object_unref0 (self->priv->builder); #line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv->builder = _tmp0_; -#line 1657 "Branch.c" +#line 1654 "Branch.c" { - GtkBuilder* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + GtkBuilder* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; GMenuModel* model = NULL; - GtkBuilder* _tmp4_ = NULL; - GObject* _tmp5_ = NULL; - GMenuModel* _tmp6_ = NULL; - GMenuModel* _tmp7_ = NULL; - GtkMenu* _tmp8_ = NULL; + GtkBuilder* _tmp4_; + GObject* _tmp5_; + GMenuModel* _tmp6_; + GMenuModel* _tmp7_; + GtkMenu* _tmp8_; #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp1_ = self->priv->builder; #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1676,8 +1673,8 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_free0 (_tmp3_); #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1680 "Branch.c" - goto __catch54_g_error; +#line 1677 "Branch.c" + goto __catch55_g_error; } #line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = self->priv->builder; @@ -1699,18 +1696,18 @@ static void tags_header_setup_context_menu (TagsHeader* self) { self->priv->context_menu = _tmp8_; #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_object_unref0 (model); -#line 1703 "Branch.c" +#line 1700 "Branch.c" } - goto __finally54; - __catch54_g_error: + goto __finally55; + __catch55_g_error: { GError* _error_ = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - Application* _tmp13_ = NULL; - Application* _tmp14_ = NULL; + GError* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + Application* _tmp13_; + Application* _tmp14_; #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" _error_ = _inner_error_; #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1737,9 +1734,9 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _application_unref0 (_tmp14_); #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_error_free0 (_error_); -#line 1741 "Branch.c" +#line 1738 "Branch.c" } - __finally54: + __finally55: #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1748,7 +1745,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { g_clear_error (&_inner_error_); #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 1752 "Branch.c" +#line 1749 "Branch.c" } } @@ -1757,23 +1754,23 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg TagsHeader * self; gboolean result = FALSE; AddTagsDialog* dialog = NULL; - AddTagsDialog* _tmp0_ = NULL; + AddTagsDialog* _tmp0_; gchar** names = NULL; - AddTagsDialog* _tmp1_ = NULL; - gint _tmp2_ = 0; - gchar** _tmp3_ = NULL; - gint names_length1 = 0; - gint _names_size_ = 0; + AddTagsDialog* _tmp1_; + gint _tmp2_; + gchar** _tmp3_; + gint names_length1; + gint _names_size_; gboolean _tmp4_ = FALSE; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - CommandManager* _tmp7_ = NULL; - CommandManager* _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GeeList* _tmp10_ = NULL; - AddTagsCommand* _tmp11_ = NULL; - AddTagsCommand* _tmp12_ = NULL; + gchar** _tmp5_; + gint _tmp5__length1; + CommandManager* _tmp7_; + CommandManager* _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; + GeeList* _tmp10_; + AddTagsCommand* _tmp11_; + AddTagsCommand* _tmp12_; #line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1800,17 +1797,17 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg if (_tmp5_ == NULL) { #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = TRUE; -#line 1804 "Branch.c" +#line 1801 "Branch.c" } else { - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + gchar** _tmp6_; + gint _tmp6__length1; #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp6_ = names; #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp6__length1 = names_length1; #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = _tmp6__length1 == 0; -#line 1814 "Branch.c" +#line 1811 "Branch.c" } #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp4_) { @@ -1822,7 +1819,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1826 "Branch.c" +#line 1823 "Branch.c" } #line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp7_ = app_window_get_command_manager (); @@ -1852,18 +1849,18 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1856 "Branch.c" +#line 1853 "Branch.c" } static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { TagsHeader * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_ = NULL; - GdkAtom _tmp1_ = 0U; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GtkSelectionData* _tmp0_; + GdkAtom _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; #line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1882,27 +1879,27 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern _g_free0 (_tmp3_); #line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp4_) { -#line 1886 "Branch.c" +#line 1883 "Branch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_ = NULL; - guchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - TagSourceCollection* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - GeeList* _tmp12_ = NULL; - GeeList* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - gboolean _tmp16_ = FALSE; - CommandManager* _tmp17_ = NULL; - CommandManager* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - Tag* _tmp20_ = NULL; - Tag* _tmp21_ = NULL; - ReparentTagCommand* _tmp22_ = NULL; - ReparentTagCommand* _tmp23_ = NULL; + GtkSelectionData* _tmp5_; + guchar* _tmp6_; + gchar* _tmp7_; + TagSourceCollection* _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; + const gchar* _tmp11_; + GeeList* _tmp12_; + GeeList* _tmp13_; + gint _tmp14_; + gint _tmp15_; + gboolean _tmp16_; + CommandManager* _tmp17_; + CommandManager* _tmp18_; + const gchar* _tmp19_; + Tag* _tmp20_; + Tag* _tmp21_; + ReparentTagCommand* _tmp22_; + ReparentTagCommand* _tmp23_; #line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp5_ = data; #line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1941,7 +1938,7 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern _g_free0 (old_tag_path); #line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1945 "Branch.c" +#line 1942 "Branch.c" } #line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp17_ = app_window_get_command_manager (); @@ -1971,13 +1968,13 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern _g_free0 (old_tag_path); #line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1975 "Branch.c" +#line 1972 "Branch.c" } #line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala" result = FALSE; #line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1981 "Branch.c" +#line 1978 "Branch.c" } @@ -1987,15 +1984,15 @@ static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEn self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_if_fail (data != NULL); -#line 1991 "Branch.c" +#line 1988 "Branch.c" } static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) { TagsHeader * self; GtkMenu* result = NULL; - GtkMenu* _tmp0_ = NULL; - GtkMenu* _tmp1_ = NULL; + GtkMenu* _tmp0_; + GtkMenu* _tmp1_; #line 181 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2006,7 +2003,7 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b result = _tmp1_; #line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2010 "Branch.c" +#line 2007 "Branch.c" } @@ -2017,7 +2014,7 @@ static void tags_header_class_init (TagsHeaderClass * klass) { g_type_class_add_private (klass, sizeof (TagsHeaderPrivate)); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (klass)->finalize = tags_header_finalize; -#line 2021 "Branch.c" +#line 2018 "Branch.c" } @@ -2025,10 +2022,10 @@ static void tags_header_sidebar_internal_drop_target_entry_interface_init (Sideb #line 125 "/home/jens/Source/shotwell/src/tags/Branch.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" - iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_header_real_internal_drop_received; + iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_header_real_internal_drop_received; #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary; -#line 2032 "Branch.c" + iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary; +#line 2029 "Branch.c" } @@ -2036,8 +2033,8 @@ static void tags_header_sidebar_internal_drag_source_entry_interface_init (Sideb #line 125 "/home/jens/Source/shotwell/src/tags/Branch.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" - iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_header_real_prepare_selection_data; -#line 2041 "Branch.c" + iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_header_real_prepare_selection_data; +#line 2038 "Branch.c" } @@ -2045,8 +2042,8 @@ static void tags_header_sidebar_contextable_interface_init (SidebarContextableIf #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) tags_header_real_get_sidebar_context_menu; -#line 2050 "Branch.c" + iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) tags_header_real_get_sidebar_context_menu; +#line 2047 "Branch.c" } @@ -2055,11 +2052,11 @@ static void tags_header_instance_init (TagsHeader * self) { self->priv = TAGS_HEADER_GET_PRIVATE (self); #line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv->context_menu = NULL; -#line 2059 "Branch.c" +#line 2056 "Branch.c" } -static void tags_header_finalize (GObject* obj) { +static void tags_header_finalize (GObject * obj) { TagsHeader * self; #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader); @@ -2069,7 +2066,7 @@ static void tags_header_finalize (GObject* obj) { _g_object_unref0 (self->priv->context_menu); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj); -#line 2073 "Branch.c" +#line 2070 "Branch.c" } @@ -2093,8 +2090,8 @@ GType tags_header_get_type (void) { TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) { TagsSidebarEntry * self = NULL; - Tag* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; + Tag* _tmp0_; + Tag* _tmp1_; #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2109,14 +2106,14 @@ TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) { self->priv->tag = _tmp1_; #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" return self; -#line 2113 "Branch.c" +#line 2110 "Branch.c" } TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) { #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag); -#line 2120 "Branch.c" +#line 2117 "Branch.c" } @@ -2130,8 +2127,8 @@ void tags_sidebar_entry_terminate (void) { Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { Tag* result = NULL; - Tag* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; + Tag* _tmp0_; + Tag* _tmp1_; #line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL); #line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2142,15 +2139,15 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { result = _tmp1_; #line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2146 "Branch.c" +#line 2143 "Branch.c" } static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { TagsSidebarEntry * self; gchar* result = NULL; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + Tag* _tmp0_; + gchar* _tmp1_; #line 207 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2161,15 +2158,15 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* result = _tmp1_; #line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2165 "Branch.c" +#line 2162 "Branch.c" } static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { TagsSidebarEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2180,15 +2177,15 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* result = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2184 "Branch.c" +#line 2181 "Branch.c" } static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { TagsSidebarEntry * self; Page* result = NULL; - Tag* _tmp0_ = NULL; - TagPage* _tmp1_ = NULL; + Tag* _tmp0_; + TagPage* _tmp1_; #line 215 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2201,7 +2198,7 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2205 "Branch.c" +#line 2202 "Branch.c" } @@ -2214,126 +2211,168 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt result = TRUE; #line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2218 "Branch.c" +#line 2215 "Branch.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 2231 "Branch.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 2234 "Branch.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 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" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 2257 "Branch.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 2261 "Branch.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 2269 "Branch.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2262 "Branch.c" - goto __catch55_g_regex_error; +#line 2301 "Branch.c" + goto __catch56_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#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); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2271 "Branch.c" +#line 2310 "Branch.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2287 "Branch.c" - goto __catch55_g_regex_error; +#line 2326 "Branch.c" + goto __catch56_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/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); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2298 "Branch.c" +#line 2337 "Branch.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2312 "Branch.c" +#line 2351 "Branch.c" } - goto __finally55; - __catch55_g_regex_error: + goto __finally56; + __catch56_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2326 "Branch.c" +#line 2365 "Branch.c" } - __finally55: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + __finally56: +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2337 "Branch.c" +#line 2376 "Branch.c" } } @@ -2341,23 +2380,23 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { TagsSidebarEntry * self; gchar* prepped = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_ = NULL; - CommandManager* _tmp11_ = NULL; - CommandManager* _tmp12_ = NULL; - Tag* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - RenameTagCommand* _tmp15_ = NULL; - RenameTagCommand* _tmp16_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + Tag* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gboolean _tmp9_; + const gchar* _tmp10_; + CommandManager* _tmp11_; + CommandManager* _tmp12_; + Tag* _tmp13_; + const gchar* _tmp14_; + RenameTagCommand* _tmp15_; + RenameTagCommand* _tmp16_; #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2376,7 +2415,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _g_free0 (prepped); #line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 2380 "Branch.c" +#line 2419 "Branch.c" } #line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp3_ = prepped; @@ -2404,7 +2443,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _g_free0 (prepped); #line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 2408 "Branch.c" +#line 2447 "Branch.c" } #line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp10_ = prepped; @@ -2414,7 +2453,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _g_free0 (prepped); #line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 2418 "Branch.c" +#line 2457 "Branch.c" } #line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp11_ = app_window_get_command_manager (); @@ -2436,14 +2475,14 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _command_manager_unref0 (_tmp12_); #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (prepped); -#line 2440 "Branch.c" +#line 2479 "Branch.c" } static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) { TagsSidebarEntry * self; - Tag* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + Tag* _tmp0_; + gboolean _tmp1_; #line 239 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2452,12 +2491,12 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); #line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp1_) { -#line 2456 "Branch.c" - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - DeleteTagCommand* _tmp5_ = NULL; - DeleteTagCommand* _tmp6_ = NULL; +#line 2495 "Branch.c" + CommandManager* _tmp2_; + CommandManager* _tmp3_; + Tag* _tmp4_; + DeleteTagCommand* _tmp5_; + DeleteTagCommand* _tmp6_; #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp2_ = app_window_get_command_manager (); #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2474,7 +2513,7 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas _g_object_unref0 (_tmp6_); #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" _command_manager_unref0 (_tmp3_); -#line 2478 "Branch.c" +#line 2517 "Branch.c" } } @@ -2482,15 +2521,15 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { TagsSidebarEntry * self; gboolean result = FALSE; - CommandManager* _tmp0_ = NULL; - CommandManager* _tmp1_ = NULL; - Tag* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - TagUntagPhotosCommand* _tmp7_ = NULL; - TagUntagPhotosCommand* _tmp8_ = NULL; + CommandManager* _tmp0_; + CommandManager* _tmp1_; + Tag* _tmp2_; + GeeList* _tmp3_; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; + TagUntagPhotosCommand* _tmp7_; + TagUntagPhotosCommand* _tmp8_; #line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2523,18 +2562,18 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD result = TRUE; #line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2527 "Branch.c" +#line 2566 "Branch.c" } static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { TagsSidebarEntry * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_ = NULL; - GdkAtom _tmp1_ = 0U; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GtkSelectionData* _tmp0_; + GdkAtom _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; #line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2553,35 +2592,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (_tmp3_); #line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp4_) { -#line 2557 "Branch.c" +#line 2596 "Branch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_ = NULL; - guchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - Tag* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - TagSourceCollection* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; + GtkSelectionData* _tmp5_; + guchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + Tag* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; + TagSourceCollection* _tmp29_; + const gchar* _tmp30_; + gboolean _tmp31_; Tag* old_tag = NULL; - const gchar* _tmp32_ = NULL; - Tag* _tmp33_ = NULL; + const gchar* _tmp32_; + Tag* _tmp33_; Tag* old_tag_parent = NULL; - Tag* _tmp34_ = NULL; - Tag* _tmp35_ = NULL; + Tag* _tmp34_; + Tag* _tmp35_; gboolean _tmp36_ = FALSE; - Tag* _tmp37_ = NULL; - CommandManager* _tmp44_ = NULL; - CommandManager* _tmp45_ = NULL; - Tag* _tmp46_ = NULL; - Tag* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - ReparentTagCommand* _tmp50_ = NULL; - ReparentTagCommand* _tmp51_ = NULL; + Tag* _tmp37_; + CommandManager* _tmp44_; + CommandManager* _tmp45_; + Tag* _tmp46_; + Tag* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + ReparentTagCommand* _tmp50_; + ReparentTagCommand* _tmp51_; #line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp5_ = data; #line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2610,19 +2649,19 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2614 "Branch.c" +#line 2653 "Branch.c" } { GeeList* _parent_path_list = NULL; - Tag* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; - GeeList* _tmp17_ = NULL; + Tag* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GeeList* _tmp16_; + GeeList* _tmp17_; gint _parent_path_size = 0; - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + GeeList* _tmp18_; + gint _tmp19_; + gint _tmp20_; gint _parent_path_index = 0; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp13_ = self->priv->tag; @@ -2650,16 +2689,16 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _parent_path_index = -1; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { -#line 2654 "Branch.c" - gint _tmp21_ = 0; - gint _tmp22_ = 0; - gint _tmp23_ = 0; +#line 2693 "Branch.c" + gint _tmp21_; + gint _tmp22_; + gint _tmp23_; gchar* parent_path = NULL; - GeeList* _tmp24_ = NULL; - gint _tmp25_ = 0; - gpointer _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; + GeeList* _tmp24_; + gint _tmp25_; + gpointer _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp21_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2672,7 +2711,7 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba if (!(_tmp22_ < _tmp23_)) { #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" break; -#line 2676 "Branch.c" +#line 2715 "Branch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp24_ = _parent_path_list; @@ -2698,15 +2737,15 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2702 "Branch.c" +#line 2741 "Branch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (parent_path); -#line 2706 "Branch.c" +#line 2745 "Branch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_object_unref0 (_parent_path_list); -#line 2710 "Branch.c" +#line 2749 "Branch.c" } #line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp29_ = tag_global; @@ -2732,13 +2771,13 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _tmp37_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp37_ != NULL) { -#line 2736 "Branch.c" - Tag* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - Tag* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; +#line 2775 "Branch.c" + Tag* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + Tag* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp38_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2757,11 +2796,11 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (_tmp43_); #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (_tmp40_); -#line 2761 "Branch.c" +#line 2800 "Branch.c" } else { #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp36_ = FALSE; -#line 2765 "Branch.c" +#line 2804 "Branch.c" } #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp36_) { @@ -2775,7 +2814,7 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2779 "Branch.c" +#line 2818 "Branch.c" } #line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp44_ = app_window_get_command_manager (); @@ -2811,13 +2850,13 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2815 "Branch.c" +#line 2854 "Branch.c" } #line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala" result = FALSE; #line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2821 "Branch.c" +#line 2860 "Branch.c" } @@ -2830,71 +2869,71 @@ static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry result = FALSE; #line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2834 "Branch.c" +#line 2873 "Branch.c" } static guint8* string_get_data (const gchar* self, int* result_length1) { guint8* result; guint8* res = NULL; - gint res_length1 = 0; - gint _res_size_ = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 2878 "Branch.c" +#line 2917 "Branch.c" } -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2884 "Branch.c" +#line 2923 "Branch.c" } static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) { TagsSidebarEntry * self; - GtkSelectionData* _tmp0_ = NULL; - GdkAtom _tmp1_ = 0U; - Tag* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - guint8* _tmp6_ = NULL; - gint _tmp6__length1 = 0; + GtkSelectionData* _tmp0_; + GdkAtom _tmp1_; + Tag* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + guint8* _tmp6_; + gint _tmp6__length1; #line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2919,7 +2958,7 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1); #line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (_tmp4_); -#line 2923 "Branch.c" +#line 2962 "Branch.c" } @@ -2929,14 +2968,14 @@ static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) { #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate)); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_name; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_icon; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_create_page; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize; -#line 2940 "Branch.c" +#line 2979 "Branch.c" } @@ -2944,10 +2983,10 @@ static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarR #line 186 "/home/jens/Source/shotwell/src/tags/Branch.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" - iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) tags_sidebar_entry_real_is_user_renameable; + iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) tags_sidebar_entry_real_is_user_renameable; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) tags_sidebar_entry_real_rename; -#line 2951 "Branch.c" + iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) tags_sidebar_entry_real_rename; +#line 2990 "Branch.c" } @@ -2955,8 +2994,8 @@ static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (Sidebar #line 186 "/home/jens/Source/shotwell/src/tags/Branch.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" - iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) tags_sidebar_entry_real_destroy_source; -#line 2960 "Branch.c" + iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) tags_sidebar_entry_real_destroy_source; +#line 2999 "Branch.c" } @@ -2964,10 +3003,10 @@ static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init #line 186 "/home/jens/Source/shotwell/src/tags/Branch.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" - iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_sidebar_entry_real_internal_drop_received; + iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_sidebar_entry_real_internal_drop_received; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary; -#line 2971 "Branch.c" + iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary; +#line 3010 "Branch.c" } @@ -2975,8 +3014,8 @@ static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarE #line 186 "/home/jens/Source/shotwell/src/tags/Branch.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" - iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) tags_sidebar_entry_real_expand_on_select; -#line 2980 "Branch.c" + iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) tags_sidebar_entry_real_expand_on_select; +#line 3019 "Branch.c" } @@ -2984,24 +3023,24 @@ static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init #line 186 "/home/jens/Source/shotwell/src/tags/Branch.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" - iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data; -#line 2989 "Branch.c" + iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data; +#line 3028 "Branch.c" } static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self); #line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG); #line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv->single_tag_icon = _tmp0_; -#line 3001 "Branch.c" +#line 3040 "Branch.c" } -static void tags_sidebar_entry_finalize (GObject* obj) { +static void tags_sidebar_entry_finalize (GObject * obj) { TagsSidebarEntry * self; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); @@ -3011,7 +3050,7 @@ static void tags_sidebar_entry_finalize (GObject* obj) { _g_object_unref0 (self->priv->tag); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj); -#line 3015 "Branch.c" +#line 3054 "Branch.c" } diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c index 82dfdda..c188835 100644 --- a/src/tags/HierarchicalTagIndex.c +++ b/src/tags/HierarchicalTagIndex.c @@ -1,4 +1,4 @@ -/* HierarchicalTagIndex.c generated by valac 0.34.7, the Vala compiler +/* HierarchicalTagIndex.c generated by valac 0.36.6, the Vala compiler * generated from HierarchicalTagIndex.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -140,16 +140,16 @@ 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 hierarchical_tag_index_finalize (HierarchicalTagIndex* obj); +static void _vala_array_add65 (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); HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) { HierarchicalTagIndex* self = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeTreeSet* _tmp1_ = NULL; + GeeHashMap* _tmp0_; + GeeTreeSet* _tmp1_; #line 11 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self = (HierarchicalTagIndex*) g_type_create_instance (object_type); #line 12 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -180,11 +180,11 @@ HierarchicalTagIndex* hierarchical_tag_index_new (void) { HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths) { HierarchicalTagIndex* result = NULL; GeeCollection* paths = NULL; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; HierarchicalTagIndex* _result_ = NULL; - HierarchicalTagIndex* _tmp3_ = NULL; + HierarchicalTagIndex* _tmp3_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (GEE_IS_COLLECTION (client_paths), NULL); #line 17 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -202,8 +202,8 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p #line 203 "HierarchicalTagIndex.c" { GeeIterator* _path_it = NULL; - GeeCollection* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeCollection* _tmp4_; + GeeIterator* _tmp5_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp4_ = paths; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -213,13 +213,13 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { #line 216 "HierarchicalTagIndex.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; gchar* path = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GeeIterator* _tmp8_; + gpointer _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp6_ = _path_it; #line 21 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -244,8 +244,8 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p if (_tmp11_) { #line 246 "HierarchicalTagIndex.c" GeeCollection* components = NULL; - const gchar* _tmp12_ = NULL; - GeeList* _tmp13_ = NULL; + const gchar* _tmp12_; + GeeList* _tmp13_; #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp12_ = path; #line 23 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -255,8 +255,8 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p #line 256 "HierarchicalTagIndex.c" { GeeIterator* _component_it = NULL; - GeeCollection* _tmp14_ = NULL; - GeeIterator* _tmp15_ = NULL; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp14_ = components; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -266,14 +266,14 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { #line 269 "HierarchicalTagIndex.c" - GeeIterator* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; + GeeIterator* _tmp16_; + gboolean _tmp17_; gchar* component = NULL; - GeeIterator* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - HierarchicalTagIndex* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + GeeIterator* _tmp18_; + gpointer _tmp19_; + HierarchicalTagIndex* _tmp20_; + const gchar* _tmp21_; + const gchar* _tmp22_; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp16_ = _component_it; #line 26 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -310,9 +310,9 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p _g_object_unref0 (components); #line 312 "HierarchicalTagIndex.c" } else { - HierarchicalTagIndex* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + HierarchicalTagIndex* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp23_ = _result_; #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -343,11 +343,11 @@ HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_p HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) { HierarchicalTagIndex* result = NULL; - TagSourceCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - HierarchicalTagIndex* _tmp3_ = NULL; - HierarchicalTagIndex* _tmp4_ = NULL; + TagSourceCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + HierarchicalTagIndex* _tmp3_; + HierarchicalTagIndex* _tmp4_; #line 37 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp0_ = tag_global; #line 37 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -369,16 +369,16 @@ HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void) { void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path) { - GeeMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeMap* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GeeSortedSet* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; + GeeMap* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; + GeeMap* _tmp7_; + const gchar* _tmp8_; + gpointer _tmp9_; + GeeCollection* _tmp10_; + const gchar* _tmp11_; + GeeSortedSet* _tmp12_; + const gchar* _tmp13_; #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (IS_HIERARCHICAL_TAG_INDEX (self)); #line 40 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -394,10 +394,10 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t #line 41 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (!_tmp2_) { #line 397 "HierarchicalTagIndex.c" - GeeMap* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; - GeeArrayList* _tmp6_ = NULL; + GeeMap* _tmp3_; + const gchar* _tmp4_; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp3_ = self->priv->tag_table; #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -438,9 +438,9 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) { GeeCollection* result = NULL; - GeeSortedSet* _tmp0_ = NULL; - GeeSortedSet* _tmp1_ = NULL; - GeeSortedSet* _tmp2_ = NULL; + GeeSortedSet* _tmp0_; + GeeSortedSet* _tmp1_; + GeeSortedSet* _tmp2_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 50 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -459,9 +459,9 @@ GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self) gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, const gchar* tag) { gboolean result = FALSE; - GeeMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeMap* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE); #line 53 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -482,9 +482,9 @@ gboolean hierarchical_tag_index_is_tag_in_index (HierarchicalTagIndex* self, con GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) { GeeCollection* result = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; #line 57 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 58 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -503,9 +503,9 @@ GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self) gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path) { gboolean result = FALSE; - GeeSortedSet* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeSortedSet* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), FALSE); #line 61 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -526,12 +526,12 @@ gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; GeeCollection* paths = NULL; - GeeMap* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeMap* _tmp4_; + const gchar* _tmp5_; + gpointer _tmp6_; #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -543,8 +543,8 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con #line 66 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (!_tmp1_) { #line 546 "HierarchicalTagIndex.c" - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp2_; + gchar* _tmp3_; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp2_ = name; #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -566,8 +566,8 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con #line 567 "HierarchicalTagIndex.c" { GeeIterator* _path_it = NULL; - GeeCollection* _tmp7_ = NULL; - GeeIterator* _tmp8_ = NULL; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp7_ = paths; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -577,22 +577,22 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" while (TRUE) { #line 580 "HierarchicalTagIndex.c" - GeeIterator* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GeeIterator* _tmp9_; + gboolean _tmp10_; gchar* path = NULL; - GeeIterator* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; + GeeIterator* _tmp11_; + gpointer _tmp12_; GeeList* components = NULL; - const gchar* _tmp13_ = NULL; - GeeList* _tmp14_ = NULL; - GeeList* _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gpointer _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; + const gchar* _tmp13_; + GeeList* _tmp14_; + GeeList* _tmp15_; + GeeList* _tmp16_; + gint _tmp17_; + gint _tmp18_; + gpointer _tmp19_; + gchar* _tmp20_; + const gchar* _tmp21_; + gboolean _tmp22_; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp9_ = _path_it; #line 70 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -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_add65 (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" @@ -685,13 +685,13 @@ static void _vala_array_add65 (gchar*** array, int* length, int* size, gchar* va gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1) { gchar** result = NULL; gchar** _result_ = NULL; - gchar** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + gchar** _tmp0_; + gint _result__length1; + gint __result__size_; + gchar** _tmp1_; + gint _tmp1__length1; + gchar** _tmp6_; + gint _tmp6__length1; #line 80 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_val_if_fail (IS_HIERARCHICAL_TAG_INDEX (self), NULL); #line 81 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -719,7 +719,7 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" for (name_it = 0; name_it < _tmp1__length1; name_it = name_it + 1) { #line 722 "HierarchicalTagIndex.c" - gchar* _tmp2_ = NULL; + gchar* _tmp2_; gchar* name = NULL; #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp2_ = g_strdup (name_collection[name_it]); @@ -727,10 +727,10 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* name = _tmp2_; #line 729 "HierarchicalTagIndex.c" { - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + gchar** _tmp3_; + gint _tmp3__length1; + const gchar* _tmp4_; + gchar* _tmp5_; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" _tmp3_ = _result_; #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -807,7 +807,7 @@ static gchar* value_hierarchical_tag_index_collect_value (GValue* value, guint n #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (collect_values[0].v_pointer) { #line 810 "HierarchicalTagIndex.c" - HierarchicalTagIndex* object; + HierarchicalTagIndex * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (object->parent_instance.g_class == NULL) { @@ -834,7 +834,7 @@ static gchar* value_hierarchical_tag_index_collect_value (GValue* value, guint n static gchar* value_hierarchical_tag_index_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - HierarchicalTagIndex** object_p; + HierarchicalTagIndex ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (!object_p) { @@ -886,7 +886,7 @@ gpointer value_get_hierarchical_tag_index (const GValue* value) { void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) { - HierarchicalTagIndex* old; + HierarchicalTagIndex * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX)); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -917,7 +917,7 @@ void value_set_hierarchical_tag_index (GValue* value, gpointer v_object) { void value_take_hierarchical_tag_index (GValue* value, gpointer v_object) { - HierarchicalTagIndex* old; + HierarchicalTagIndex * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_INDEX)); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" @@ -965,7 +965,7 @@ static void hierarchical_tag_index_instance_init (HierarchicalTagIndex * self) { } -static void hierarchical_tag_index_finalize (HierarchicalTagIndex* obj) { +static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj) { HierarchicalTagIndex * self; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndex); @@ -994,7 +994,7 @@ GType hierarchical_tag_index_get_type (void) { gpointer hierarchical_tag_index_ref (gpointer instance) { - HierarchicalTagIndex* self; + HierarchicalTagIndex * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" g_atomic_int_inc (&self->ref_count); @@ -1005,7 +1005,7 @@ gpointer hierarchical_tag_index_ref (gpointer instance) { void hierarchical_tag_index_unref (gpointer instance) { - HierarchicalTagIndex* self; + HierarchicalTagIndex * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c index f213e17..f8cfd5d 100644 --- a/src/tags/HierarchicalTagUtilities.c +++ b/src/tags/HierarchicalTagUtilities.c @@ -1,4 +1,4 @@ -/* HierarchicalTagUtilities.c generated by valac 0.34.7, the Vala compiler +/* HierarchicalTagUtilities.c generated by valac 0.36.6, the Vala compiler * generated from HierarchicalTagUtilities.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -198,7 +198,7 @@ GeeList* tag_get_hierarchical_children (Tag* self); void tag_flatten (Tag* self); HierarchicalTagUtilities* hierarchical_tag_utilities_new (void); HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_type); -static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities* obj); +static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -211,8 +211,8 @@ static gint _vala_array_length (gpointer array); */ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; #line 14 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (name != NULL, NULL); #line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -222,8 +222,8 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { #line 15 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!_tmp1_) { #line 225 "HierarchicalTagUtilities.c" - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp2_; + gchar* _tmp3_; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp2_ = name; #line 16 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -234,8 +234,8 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { return result; #line 236 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp4_; + gchar* _tmp5_; #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp4_ = name; #line 18 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -259,41 +259,41 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) { static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 279 "HierarchicalTagUtilities.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp4_; +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 287 "HierarchicalTagUtilities.c" } else { - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp5_; + gchar* _tmp6_; +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 299 "HierarchicalTagUtilities.c" } @@ -304,121 +304,121 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp1_; + glong _tmp8_; + glong _tmp14_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + glong _tmp21_; + gchar* _tmp22_; +#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 323 "HierarchicalTagUtilities.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp2_; +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 329 "HierarchicalTagUtilities.c" } else { -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 333 "HierarchicalTagUtilities.c" } -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 337 "HierarchicalTagUtilities.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp3_; + glong _tmp4_; + glong _tmp5_; +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 349 "HierarchicalTagUtilities.c" } else { - gint _tmp6_ = 0; - gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp6_; + gint _tmp7_; +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 359 "HierarchicalTagUtilities.c" } -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 365 "HierarchicalTagUtilities.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp9_; + glong _tmp10_; + glong _tmp11_; +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 379 "HierarchicalTagUtilities.c" } else { - glong _tmp12_ = 0L; - glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp12_; + glong _tmp13_; +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 389 "HierarchicalTagUtilities.c" } -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 395 "HierarchicalTagUtilities.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp15_; + glong _tmp16_; +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 404 "HierarchicalTagUtilities.c" } -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 424 "HierarchicalTagUtilities.c" } @@ -426,8 +426,8 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; #line 28 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (path != NULL, NULL); #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -437,13 +437,13 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { #line 29 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp1_) { #line 440 "HierarchicalTagUtilities.c" - const gchar* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + const gchar* _tmp2_; + GeeList* _tmp3_; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp2_ = path; #line 30 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -468,8 +468,8 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { return result; #line 470 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + const gchar* _tmp9_; + gchar* _tmp10_; #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp9_ = path; #line 34 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -491,12 +491,12 @@ gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path) { GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path) { GeeList* result = NULL; gchar* path = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; GeeList* _result_ = NULL; - GeeArrayList* _tmp2_ = NULL; + GeeArrayList* _tmp2_; gchar* accumulator = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp3_; #line 43 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -516,12 +516,12 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path #line 517 "HierarchicalTagUtilities.c" { GeeList* _component_list = NULL; - const gchar* _tmp4_ = NULL; - GeeList* _tmp5_ = NULL; + const gchar* _tmp4_; + GeeList* _tmp5_; gint _component_size = 0; - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _component_index = 0; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp4_ = path; @@ -542,20 +542,20 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { #line 545 "HierarchicalTagUtilities.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; gchar* component = NULL; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + GeeList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp9_ = _component_index; #line 49 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -601,8 +601,8 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path #line 51 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (g_strcmp0 (_tmp20_, _tmp21_) != 0) { #line 604 "HierarchicalTagUtilities.c" - GeeList* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; + GeeList* _tmp22_; + const gchar* _tmp23_; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp22_ = _result_; #line 52 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -640,21 +640,21 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path) { GeeList* result = NULL; gchar* path = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; GeeArrayList* components = NULL; - GeeArrayList* _tmp2_ = NULL; + GeeArrayList* _tmp2_; gchar** raw_components = NULL; - const gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint raw_components_length1 = 0; - gint _raw_components_size_ = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - GeeArrayList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + const gchar* _tmp3_; + gchar** _tmp4_; + gchar** _tmp5_; + gint raw_components_length1; + gint _raw_components_size_; + gchar** _tmp6_; + gint _tmp6__length1; + GeeArrayList* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 64 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -694,7 +694,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" for (component_it = 0; component_it < _tmp6__length1; component_it = component_it + 1) { #line 697 "HierarchicalTagUtilities.c" - gchar* _tmp7_ = NULL; + gchar* _tmp7_; gchar* component = NULL; #line 71 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp7_ = g_strdup (component_collection[component_it]); @@ -702,14 +702,14 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p component = _tmp7_; #line 704 "HierarchicalTagUtilities.c" { - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp8_ = component; #line 72 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (g_strcmp0 (_tmp8_, "") != 0) { #line 711 "HierarchicalTagUtilities.c" - GeeArrayList* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + GeeArrayList* _tmp9_; + const gchar* _tmp10_; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp9_ = components; #line 73 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -751,408 +751,408 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p */ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; #line 766 "HierarchicalTagUtilities.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 776 "HierarchicalTagUtilities.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 786 "HierarchicalTagUtilities.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 792 "HierarchicalTagUtilities.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 803 "HierarchicalTagUtilities.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 815 "HierarchicalTagUtilities.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 819 "HierarchicalTagUtilities.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 823 "HierarchicalTagUtilities.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 827 "HierarchicalTagUtilities.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; #line 850 "HierarchicalTagUtilities.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 859 "HierarchicalTagUtilities.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 872 "HierarchicalTagUtilities.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 878 "HierarchicalTagUtilities.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 888 "HierarchicalTagUtilities.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 900 "HierarchicalTagUtilities.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 904 "HierarchicalTagUtilities.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 910 "HierarchicalTagUtilities.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 921 "HierarchicalTagUtilities.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 936 "HierarchicalTagUtilities.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 940 "HierarchicalTagUtilities.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 944 "HierarchicalTagUtilities.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 950 "HierarchicalTagUtilities.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 962 "HierarchicalTagUtilities.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 983 "HierarchicalTagUtilities.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 987 "HierarchicalTagUtilities.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 993 "HierarchicalTagUtilities.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 1000 "HierarchicalTagUtilities.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1008 "HierarchicalTagUtilities.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 1046 "HierarchicalTagUtilities.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 1055 "HierarchicalTagUtilities.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 1071 "HierarchicalTagUtilities.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 1077 "HierarchicalTagUtilities.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 1091 "HierarchicalTagUtilities.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 1111 "HierarchicalTagUtilities.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 1126 "HierarchicalTagUtilities.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 1130 "HierarchicalTagUtilities.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 1138 "HierarchicalTagUtilities.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1149 "HierarchicalTagUtilities.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1158 "HierarchicalTagUtilities.c" } @@ -1161,20 +1161,20 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1) { gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; gchar* tmp = NULL; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar** _tmp6_ = NULL; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + gchar** _tmp1_; + gint _tmp1__length1; + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar** _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; + gchar* _tmp8_; + gchar* _tmp9_; #line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp0_ = path_components; #line 87 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1230,14 +1230,14 @@ gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) { gchar* result = NULL; gchar* path = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; GeeList* components = NULL; - GeeList* _tmp2_ = NULL; + GeeList* _tmp2_; gchar* basename = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gpointer _tmp5_ = NULL; + gint _tmp3_; + gint _tmp4_; + gpointer _tmp5_; #line 93 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_path != NULL, NULL); #line 94 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1272,154 +1272,196 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1283 "HierarchicalTagUtilities.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 1289 "HierarchicalTagUtilities.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 1296 "HierarchicalTagUtilities.c" + } +#line 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 1302 "HierarchicalTagUtilities.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 1312 "HierarchicalTagUtilities.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 1316 "HierarchicalTagUtilities.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 1324 "HierarchicalTagUtilities.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1314 "HierarchicalTagUtilities.c" - goto __catch56_g_regex_error; +#line 1356 "HierarchicalTagUtilities.c" + goto __catch57_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#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); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 1323 "HierarchicalTagUtilities.c" +#line 1365 "HierarchicalTagUtilities.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1339 "HierarchicalTagUtilities.c" - goto __catch56_g_regex_error; +#line 1381 "HierarchicalTagUtilities.c" + goto __catch57_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/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); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 1350 "HierarchicalTagUtilities.c" +#line 1392 "HierarchicalTagUtilities.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1364 "HierarchicalTagUtilities.c" +#line 1406 "HierarchicalTagUtilities.c" } - goto __finally56; - __catch56_g_regex_error: + goto __finally57; + __catch57_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 1378 "HierarchicalTagUtilities.c" +#line 1420 "HierarchicalTagUtilities.c" } - __finally56: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + __finally57: +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 1389 "HierarchicalTagUtilities.c" +#line 1431 "HierarchicalTagUtilities.c" } } static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; - glong _tmp0_ = 0L; - gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp0_; + gchar _tmp1_; +#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1408 "HierarchicalTagUtilities.c" +#line 1450 "HierarchicalTagUtilities.c" } gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator) { gchar* result = NULL; gchar* _result_ = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gboolean _tmp4_; gboolean is_valid = FALSE; const gchar* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - gchar* _tmp20_ = NULL; + gboolean _tmp18_; + gchar* _tmp20_; #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_tag != NULL, NULL); #line 103 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1438,9 +1480,9 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar _tmp4_ = g_str_has_prefix (_tmp3_, TAG_PATH_SEPARATOR_STRING); #line 106 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!_tmp4_) { -#line 1442 "HierarchicalTagUtilities.c" - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 1484 "HierarchicalTagUtilities.c" + const gchar* _tmp5_; + gchar* _tmp6_; #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp5_ = _result_; #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1449,40 +1491,40 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar _g_free0 (_result_); #line 107 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _result_ = _tmp6_; -#line 1453 "HierarchicalTagUtilities.c" +#line 1495 "HierarchicalTagUtilities.c" } #line 110 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" is_valid = FALSE; -#line 1457 "HierarchicalTagUtilities.c" +#line 1499 "HierarchicalTagUtilities.c" { gint i = 0; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = 0; -#line 1462 "HierarchicalTagUtilities.c" +#line 1504 "HierarchicalTagUtilities.c" { gboolean _tmp7_ = FALSE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp7_ = TRUE; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1469 "HierarchicalTagUtilities.c" - gint _tmp9_ = 0; - const gchar* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - const gchar* _tmp13_ = NULL; - gint _tmp14_ = 0; - gchar _tmp15_ = '\0'; - gchar _tmp16_ = '\0'; +#line 1511 "HierarchicalTagUtilities.c" + gint _tmp9_; + const gchar* _tmp10_; + gint _tmp11_; + gint _tmp12_; + const gchar* _tmp13_; + gint _tmp14_; + gchar _tmp15_; + gchar _tmp16_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!_tmp7_) { -#line 1480 "HierarchicalTagUtilities.c" - gint _tmp8_ = 0; +#line 1522 "HierarchicalTagUtilities.c" + gint _tmp8_; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp8_ = i; #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = _tmp8_ + 1; -#line 1486 "HierarchicalTagUtilities.c" +#line 1528 "HierarchicalTagUtilities.c" } #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp7_ = FALSE; @@ -1498,7 +1540,7 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar if (!(_tmp9_ < _tmp12_)) { #line 111 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1502 "HierarchicalTagUtilities.c" +#line 1544 "HierarchicalTagUtilities.c" } #line 112 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp13_ = _result_; @@ -1514,7 +1556,7 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar is_valid = TRUE; #line 114 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1518 "HierarchicalTagUtilities.c" +#line 1560 "HierarchicalTagUtilities.c" } } } @@ -1523,17 +1565,17 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar _tmp18_ = is_valid; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp18_) { -#line 1527 "HierarchicalTagUtilities.c" - const gchar* _tmp19_ = NULL; +#line 1569 "HierarchicalTagUtilities.c" + const gchar* _tmp19_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp19_ = _result_; #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp17_ = _tmp19_; -#line 1533 "HierarchicalTagUtilities.c" +#line 1575 "HierarchicalTagUtilities.c" } else { #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp17_ = NULL; -#line 1537 "HierarchicalTagUtilities.c" +#line 1579 "HierarchicalTagUtilities.c" } #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp20_ = g_strdup (_tmp17_); @@ -1543,14 +1585,14 @@ gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar _g_free0 (_result_); #line 118 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1547 "HierarchicalTagUtilities.c" +#line 1589 "HierarchicalTagUtilities.c" } gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 121 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (in_tag != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1561,25 +1603,25 @@ gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag) { result = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1565 "HierarchicalTagUtilities.c" +#line 1607 "HierarchicalTagUtilities.c" } HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_keywords (GeeCollection* h_keywords) { HierarchicalTagIndex* result = NULL; HierarchicalTagIndex* index = NULL; - HierarchicalTagIndex* _tmp0_ = NULL; + HierarchicalTagIndex* _tmp0_; #line 125 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_val_if_fail (GEE_IS_COLLECTION (h_keywords), NULL); #line 126 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp0_ = hierarchical_tag_index_new (); #line 126 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" index = _tmp0_; -#line 1579 "HierarchicalTagUtilities.c" +#line 1621 "HierarchicalTagUtilities.c" { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp1_ = h_keywords; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1588,29 +1630,29 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key _keyword_it = _tmp2_; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1592 "HierarchicalTagUtilities.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1634 "HierarchicalTagUtilities.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; gchar* keyword = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; GeeList* parent_paths = NULL; - const gchar* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; + const gchar* _tmp7_; + GeeList* _tmp8_; GeeList* path_components = NULL; - const gchar* _tmp9_ = NULL; - GeeList* _tmp10_ = NULL; - GeeList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - GeeList* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - HierarchicalTagIndex* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; + const gchar* _tmp9_; + GeeList* _tmp10_; + GeeList* _tmp11_; + gint _tmp12_; + gint _tmp13_; + GeeList* _tmp14_; + gint _tmp15_; + gint _tmp16_; + HierarchicalTagIndex* _tmp39_; + const gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + const gchar* _tmp43_; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp3_ = _keyword_it; #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1619,7 +1661,7 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key if (!_tmp4_) { #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1623 "HierarchicalTagUtilities.c" +#line 1665 "HierarchicalTagUtilities.c" } #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp5_ = _keyword_it; @@ -1653,39 +1695,39 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key _tmp16_ = _tmp15_; #line 134 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _vala_assert (_tmp13_ <= _tmp16_, "parent_paths.size <= path_components.size"); -#line 1657 "HierarchicalTagUtilities.c" +#line 1699 "HierarchicalTagUtilities.c" { gint i = 0; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = 0; -#line 1662 "HierarchicalTagUtilities.c" +#line 1704 "HierarchicalTagUtilities.c" { gboolean _tmp17_ = FALSE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp17_ = TRUE; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" while (TRUE) { -#line 1669 "HierarchicalTagUtilities.c" - gint _tmp19_ = 0; - GeeList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gint _tmp22_ = 0; - HierarchicalTagIndex* _tmp23_ = NULL; - GeeList* _tmp24_ = NULL; - gint _tmp25_ = 0; - gpointer _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_ = FALSE; +#line 1711 "HierarchicalTagUtilities.c" + gint _tmp19_; + GeeList* _tmp20_; + gint _tmp21_; + gint _tmp22_; + HierarchicalTagIndex* _tmp23_; + GeeList* _tmp24_; + gint _tmp25_; + gpointer _tmp26_; + gchar* _tmp27_; + gboolean _tmp28_; + gboolean _tmp29_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!_tmp17_) { -#line 1683 "HierarchicalTagUtilities.c" - gint _tmp18_ = 0; +#line 1725 "HierarchicalTagUtilities.c" + gint _tmp18_; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp18_ = i; #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" i = _tmp18_ + 1; -#line 1689 "HierarchicalTagUtilities.c" +#line 1731 "HierarchicalTagUtilities.c" } #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp17_ = FALSE; @@ -1701,7 +1743,7 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key if (!(_tmp19_ < _tmp22_)) { #line 136 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" break; -#line 1705 "HierarchicalTagUtilities.c" +#line 1747 "HierarchicalTagUtilities.c" } #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp23_ = index; @@ -1721,16 +1763,16 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key _g_free0 (_tmp27_); #line 137 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp29_) { -#line 1725 "HierarchicalTagUtilities.c" - HierarchicalTagIndex* _tmp30_ = NULL; - GeeList* _tmp31_ = NULL; - gint _tmp32_ = 0; - gpointer _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - GeeList* _tmp35_ = NULL; - gint _tmp36_ = 0; - gpointer _tmp37_ = NULL; - gchar* _tmp38_ = NULL; +#line 1767 "HierarchicalTagUtilities.c" + HierarchicalTagIndex* _tmp30_; + GeeList* _tmp31_; + gint _tmp32_; + gpointer _tmp33_; + gchar* _tmp34_; + GeeList* _tmp35_; + gint _tmp36_; + gpointer _tmp37_; + gchar* _tmp38_; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp30_ = index; #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1755,7 +1797,7 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key _g_free0 (_tmp38_); #line 138 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (_tmp34_); -#line 1759 "HierarchicalTagUtilities.c" +#line 1801 "HierarchicalTagUtilities.c" } } } @@ -1780,40 +1822,40 @@ HierarchicalTagIndex* hierarchical_tag_utilities_process_hierarchical_import_key _g_object_unref0 (parent_paths); #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (keyword); -#line 1784 "HierarchicalTagUtilities.c" +#line 1826 "HierarchicalTagUtilities.c" } #line 128 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (_keyword_it); -#line 1788 "HierarchicalTagUtilities.c" +#line 1830 "HierarchicalTagUtilities.c" } #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" result = index; #line 144 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1794 "HierarchicalTagUtilities.c" +#line 1836 "HierarchicalTagUtilities.c" } gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gboolean _tmp6_ = FALSE; + const gchar* _tmp0_; + const gchar* _tmp1_; + GeeList* _tmp2_; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; + gboolean _tmp6_; gchar* path = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - TagSourceCollection* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + const gchar* _tmp9_; + gchar* _tmp10_; + TagSourceCollection* _tmp11_; + const gchar* _tmp12_; + gboolean _tmp13_; const gchar* _tmp20_ = NULL; - TagSourceCollection* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - gchar* _tmp25_ = NULL; + TagSourceCollection* _tmp21_; + const gchar* _tmp22_; + gboolean _tmp23_; + gchar* _tmp25_; #line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp0_ = client_path; #line 148 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1822,7 +1864,7 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) result = NULL; #line 149 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1826 "HierarchicalTagUtilities.c" +#line 1868 "HierarchicalTagUtilities.c" } #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp1_ = client_path; @@ -1840,9 +1882,9 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) _g_object_unref0 (_tmp3_); #line 151 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp6_) { -#line 1844 "HierarchicalTagUtilities.c" - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; +#line 1886 "HierarchicalTagUtilities.c" + const gchar* _tmp7_; + gchar* _tmp8_; #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp7_ = client_path; #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1851,7 +1893,7 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) result = _tmp8_; #line 152 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1855 "HierarchicalTagUtilities.c" +#line 1897 "HierarchicalTagUtilities.c" } #line 154 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp9_ = client_path; @@ -1867,18 +1909,18 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) _tmp13_ = tag_source_collection_exists (_tmp11_, _tmp12_, FALSE); #line 156 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!_tmp13_) { -#line 1871 "HierarchicalTagUtilities.c" - const gchar* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; +#line 1913 "HierarchicalTagUtilities.c" + const gchar* _tmp14_; + gboolean _tmp15_; #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp14_ = path; #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING); #line 157 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp15_) { -#line 1880 "HierarchicalTagUtilities.c" - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; +#line 1922 "HierarchicalTagUtilities.c" + const gchar* _tmp16_; + gchar* _tmp17_; #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp16_ = path; #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1887,10 +1929,10 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) _g_free0 (path); #line 158 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" path = _tmp17_; -#line 1891 "HierarchicalTagUtilities.c" +#line 1933 "HierarchicalTagUtilities.c" } else { - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + const gchar* _tmp18_; + gchar* _tmp19_; #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp18_ = path; #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1899,7 +1941,7 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) _g_free0 (path); #line 160 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" path = _tmp19_; -#line 1903 "HierarchicalTagUtilities.c" +#line 1945 "HierarchicalTagUtilities.c" } } #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1910,17 +1952,17 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) _tmp23_ = tag_source_collection_exists (_tmp21_, _tmp22_, FALSE); #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp23_) { -#line 1914 "HierarchicalTagUtilities.c" - const gchar* _tmp24_ = NULL; +#line 1956 "HierarchicalTagUtilities.c" + const gchar* _tmp24_; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp24_ = path; #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp20_ = _tmp24_; -#line 1920 "HierarchicalTagUtilities.c" +#line 1962 "HierarchicalTagUtilities.c" } else { #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp20_ = NULL; -#line 1924 "HierarchicalTagUtilities.c" +#line 1966 "HierarchicalTagUtilities.c" } #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp25_ = g_strdup (_tmp20_); @@ -1930,17 +1972,17 @@ gchar* hierarchical_tag_utilities_get_root_path_form (const gchar* client_path) _g_free0 (path); #line 163 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return result; -#line 1934 "HierarchicalTagUtilities.c" +#line 1976 "HierarchicalTagUtilities.c" } void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { GeeList* paths = NULL; - const gchar* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + const gchar* _tmp0_; + GeeList* _tmp1_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (path != NULL); #line 167 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1957,17 +1999,17 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { _tmp4_ = _tmp3_; #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp4_ == 0) { -#line 1961 "HierarchicalTagUtilities.c" +#line 2003 "HierarchicalTagUtilities.c" gchar* actual_path = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; + const gchar* _tmp7_; Tag* t = NULL; - TagSourceCollection* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + TagSourceCollection* _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; gboolean _tmp13_ = FALSE; - Tag* _tmp14_ = NULL; + Tag* _tmp14_; #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp5_ = path; #line 170 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -1984,7 +2026,7 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { _g_object_unref0 (paths); #line 173 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return; -#line 1988 "HierarchicalTagUtilities.c" +#line 2030 "HierarchicalTagUtilities.c" } #line 175 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" t = NULL; @@ -1996,9 +2038,9 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { _tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE); #line 176 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp10_) { -#line 2000 "HierarchicalTagUtilities.c" - const gchar* _tmp11_ = NULL; - Tag* _tmp12_ = NULL; +#line 2042 "HierarchicalTagUtilities.c" + const gchar* _tmp11_; + Tag* _tmp12_; #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp11_ = actual_path; #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -2007,18 +2049,18 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { _g_object_unref0 (t); #line 177 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" t = _tmp12_; -#line 2011 "HierarchicalTagUtilities.c" +#line 2053 "HierarchicalTagUtilities.c" } #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp14_ = t; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp14_ != NULL) { -#line 2017 "HierarchicalTagUtilities.c" - Tag* _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; - GeeList* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; +#line 2059 "HierarchicalTagUtilities.c" + Tag* _tmp15_; + GeeList* _tmp16_; + GeeList* _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp15_ = t; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -2033,31 +2075,31 @@ void hierarchical_tag_utilities_cleanup_root_path (const gchar* path) { _tmp13_ = _tmp19_ == 0; #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (_tmp17_); -#line 2037 "HierarchicalTagUtilities.c" +#line 2079 "HierarchicalTagUtilities.c" } else { #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp13_ = FALSE; -#line 2041 "HierarchicalTagUtilities.c" +#line 2083 "HierarchicalTagUtilities.c" } #line 179 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (_tmp13_) { -#line 2045 "HierarchicalTagUtilities.c" - Tag* _tmp20_ = NULL; +#line 2087 "HierarchicalTagUtilities.c" + Tag* _tmp20_; #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _tmp20_ = t; #line 180 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" tag_flatten (_tmp20_); -#line 2051 "HierarchicalTagUtilities.c" +#line 2093 "HierarchicalTagUtilities.c" } #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (t); #line 169 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_free0 (actual_path); -#line 2057 "HierarchicalTagUtilities.c" +#line 2099 "HierarchicalTagUtilities.c" } #line 166 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" _g_object_unref0 (paths); -#line 2061 "HierarchicalTagUtilities.c" +#line 2103 "HierarchicalTagUtilities.c" } @@ -2067,21 +2109,21 @@ HierarchicalTagUtilities* hierarchical_tag_utilities_construct (GType object_typ self = (HierarchicalTagUtilities*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return self; -#line 2071 "HierarchicalTagUtilities.c" +#line 2113 "HierarchicalTagUtilities.c" } HierarchicalTagUtilities* hierarchical_tag_utilities_new (void) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return hierarchical_tag_utilities_construct (TYPE_HIERARCHICAL_TAG_UTILITIES); -#line 2078 "HierarchicalTagUtilities.c" +#line 2120 "HierarchicalTagUtilities.c" } static void value_hierarchical_tag_utilities_init (GValue* value) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2085 "HierarchicalTagUtilities.c" +#line 2127 "HierarchicalTagUtilities.c" } @@ -2090,7 +2132,7 @@ static void value_hierarchical_tag_utilities_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (value->data[0].v_pointer); -#line 2094 "HierarchicalTagUtilities.c" +#line 2136 "HierarchicalTagUtilities.c" } } @@ -2100,11 +2142,11 @@ static void value_hierarchical_tag_utilities_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" dest_value->data[0].v_pointer = hierarchical_tag_utilities_ref (src_value->data[0].v_pointer); -#line 2104 "HierarchicalTagUtilities.c" +#line 2146 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" dest_value->data[0].v_pointer = NULL; -#line 2108 "HierarchicalTagUtilities.c" +#line 2150 "HierarchicalTagUtilities.c" } } @@ -2112,66 +2154,66 @@ static void value_hierarchical_tag_utilities_copy_value (const GValue* src_value static gpointer value_hierarchical_tag_utilities_peek_pointer (const GValue* value) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return value->data[0].v_pointer; -#line 2116 "HierarchicalTagUtilities.c" +#line 2158 "HierarchicalTagUtilities.c" } static gchar* value_hierarchical_tag_utilities_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (collect_values[0].v_pointer) { -#line 2123 "HierarchicalTagUtilities.c" - HierarchicalTagUtilities* object; +#line 2165 "HierarchicalTagUtilities.c" + HierarchicalTagUtilities * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2130 "HierarchicalTagUtilities.c" +#line 2172 "HierarchicalTagUtilities.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2134 "HierarchicalTagUtilities.c" +#line 2176 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = hierarchical_tag_utilities_ref (object); -#line 2138 "HierarchicalTagUtilities.c" +#line 2180 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2142 "HierarchicalTagUtilities.c" +#line 2184 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return NULL; -#line 2146 "HierarchicalTagUtilities.c" +#line 2188 "HierarchicalTagUtilities.c" } static gchar* value_hierarchical_tag_utilities_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - HierarchicalTagUtilities** object_p; + HierarchicalTagUtilities ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2157 "HierarchicalTagUtilities.c" +#line 2199 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = NULL; -#line 2163 "HierarchicalTagUtilities.c" +#line 2205 "HierarchicalTagUtilities.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = value->data[0].v_pointer; -#line 2167 "HierarchicalTagUtilities.c" +#line 2209 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" *object_p = hierarchical_tag_utilities_ref (value->data[0].v_pointer); -#line 2171 "HierarchicalTagUtilities.c" +#line 2213 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return NULL; -#line 2175 "HierarchicalTagUtilities.c" +#line 2217 "HierarchicalTagUtilities.c" } @@ -2185,7 +2227,7 @@ GParamSpec* param_spec_hierarchical_tag_utilities (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return G_PARAM_SPEC (spec); -#line 2189 "HierarchicalTagUtilities.c" +#line 2231 "HierarchicalTagUtilities.c" } @@ -2194,12 +2236,12 @@ gpointer value_get_hierarchical_tag_utilities (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES), NULL); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return value->data[0].v_pointer; -#line 2198 "HierarchicalTagUtilities.c" +#line 2240 "HierarchicalTagUtilities.c" } void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) { - HierarchicalTagUtilities* old; + HierarchicalTagUtilities * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES)); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -2214,23 +2256,23 @@ void value_set_hierarchical_tag_utilities (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_ref (value->data[0].v_pointer); -#line 2218 "HierarchicalTagUtilities.c" +#line 2260 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2222 "HierarchicalTagUtilities.c" +#line 2264 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (old); -#line 2228 "HierarchicalTagUtilities.c" +#line 2270 "HierarchicalTagUtilities.c" } } void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object) { - HierarchicalTagUtilities* old; + HierarchicalTagUtilities * old; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_TAG_UTILITIES)); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" @@ -2243,17 +2285,17 @@ void value_take_hierarchical_tag_utilities (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = v_object; -#line 2247 "HierarchicalTagUtilities.c" +#line 2289 "HierarchicalTagUtilities.c" } else { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" value->data[0].v_pointer = NULL; -#line 2251 "HierarchicalTagUtilities.c" +#line 2293 "HierarchicalTagUtilities.c" } #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" hierarchical_tag_utilities_unref (old); -#line 2257 "HierarchicalTagUtilities.c" +#line 2299 "HierarchicalTagUtilities.c" } } @@ -2263,24 +2305,24 @@ static void hierarchical_tag_utilities_class_init (HierarchicalTagUtilitiesClass hierarchical_tag_utilities_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" ((HierarchicalTagUtilitiesClass *) klass)->finalize = hierarchical_tag_utilities_finalize; -#line 2267 "HierarchicalTagUtilities.c" +#line 2309 "HierarchicalTagUtilities.c" } static void hierarchical_tag_utilities_instance_init (HierarchicalTagUtilities * self) { #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self->ref_count = 1; -#line 2274 "HierarchicalTagUtilities.c" +#line 2316 "HierarchicalTagUtilities.c" } -static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities* obj) { +static void hierarchical_tag_utilities_finalize (HierarchicalTagUtilities * obj) { HierarchicalTagUtilities * self; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_TAG_UTILITIES, HierarchicalTagUtilities); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_signal_handlers_destroy (self); -#line 2284 "HierarchicalTagUtilities.c" +#line 2326 "HierarchicalTagUtilities.c" } @@ -2299,18 +2341,18 @@ GType hierarchical_tag_utilities_get_type (void) { gpointer hierarchical_tag_utilities_ref (gpointer instance) { - HierarchicalTagUtilities* self; + HierarchicalTagUtilities * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" return instance; -#line 2309 "HierarchicalTagUtilities.c" +#line 2351 "HierarchicalTagUtilities.c" } void hierarchical_tag_utilities_unref (gpointer instance) { - HierarchicalTagUtilities* self; + HierarchicalTagUtilities * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2318,7 +2360,7 @@ void hierarchical_tag_utilities_unref (gpointer instance) { HIERARCHICAL_TAG_UTILITIES_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2322 "HierarchicalTagUtilities.c" +#line 2364 "HierarchicalTagUtilities.c" } } diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c index 6e347f7..efc0340 100644 --- a/src/tags/TagPage.c +++ b/src/tags/TagPage.c @@ -1,4 +1,4 @@ -/* TagPage.c generated by valac 0.34.7, the Vala compiler +/* TagPage.c generated by valac 0.36.6, the Vala compiler * generated from TagPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -730,7 +730,7 @@ GType media_source_get_type (void) G_GNUC_CONST; TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach); TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach); GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; -static void tag_page_finalize (GObject* obj); +static void tag_page_finalize (GObject * obj); static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_delete_tag_gsimple_action_activate_callback}, {"RenameTag", _tag_page_on_rename_tag_gsimple_action_activate_callback}, {"RemoveTagFromPhotos", _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback}, {"NewChildTagSidebar", _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback}}; @@ -787,15 +787,15 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g TagPage* tag_page_construct (GType object_type, Tag* tag) { TagPage * self = NULL; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - Tag* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - TagSourceCollection* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + Tag* _tmp3_; + Tag* _tmp4_; + TagSourceCollection* _tmp5_; + Tag* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -847,8 +847,8 @@ TagPage* tag_page_new (Tag* tag) { static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { TagPage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -867,8 +867,8 @@ static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_fil Tag* tag_page_get_tag (TagPage* self) { Tag* result = NULL; - Tag* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; + Tag* _tmp0_; + Tag* _tmp1_; #line 31 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_val_if_fail (IS_TAG_PAGE (self), NULL); #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -887,8 +887,8 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor TagPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -922,10 +922,10 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { TagPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 39 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -946,8 +946,8 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort static void tag_page_real_add_actions (Page* base, GActionMap* map) { TagPage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -966,7 +966,7 @@ static void tag_page_real_add_actions (Page* base, GActionMap* map) { static void tag_page_real_remove_actions (Page* base, GActionMap* map) { TagPage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -993,9 +993,9 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) { entry = entry_collection[entry_it]; #line 995 "TagPage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = map; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1012,9 +1012,9 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) { static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { - GeeMap* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeMap* _tmp0_; + Tag* _tmp1_; + gboolean _tmp2_; #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1028,15 +1028,15 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { #line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp2_) { #line 1031 "TagPage.c" - Tag* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - gint _tmp8_ = 0; - ViewCollection* _tmp9_ = NULL; - ViewCollection* _tmp10_ = NULL; - gint _tmp11_ = 0; + Tag* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + gint _tmp8_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + gint _tmp11_; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = self->priv->tag; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1072,21 +1072,21 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { static void tag_page_real_switched_to (Page* base) { TagPage * self; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - Tag* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - Tag* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + Tag* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 70 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1145,25 +1145,25 @@ static void tag_page_real_switched_to (Page* base) { static void tag_page_real_update_actions (Page* base, gint selected_count, gint count) { TagPage * self; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - Tag* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - Tag* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gint _tmp13_ = 0; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + Tag* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gint _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gint _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1230,14 +1230,14 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint static void tag_page_on_new_child_tag_sidebar (TagPage* self) { NewChildTagCommand* creation_command = NULL; - Tag* _tmp0_ = NULL; - NewChildTagCommand* _tmp1_ = NULL; - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - LibraryWindow* _tmp4_ = NULL; - LibraryWindow* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - Tag* _tmp7_ = NULL; + Tag* _tmp0_; + NewChildTagCommand* _tmp1_; + CommandManager* _tmp2_; + CommandManager* _tmp3_; + LibraryWindow* _tmp4_; + LibraryWindow* _tmp5_; + Tag* _tmp6_; + Tag* _tmp7_; #line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1275,9 +1275,9 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) { static void tag_page_on_rename_tag (TagPage* self) { - LibraryWindow* _tmp0_ = NULL; - LibraryWindow* _tmp1_ = NULL; - Tag* _tmp2_ = NULL; + LibraryWindow* _tmp0_; + LibraryWindow* _tmp1_; + Tag* _tmp2_; #line 107 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1295,8 +1295,8 @@ static void tag_page_on_rename_tag (TagPage* self) { static void tag_page_on_delete_tag (TagPage* self) { - Tag* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + Tag* _tmp0_; + gboolean _tmp1_; #line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1306,11 +1306,11 @@ static void tag_page_on_delete_tag (TagPage* self) { #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp1_) { #line 1309 "TagPage.c" - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - DeleteTagCommand* _tmp5_ = NULL; - DeleteTagCommand* _tmp6_ = NULL; + CommandManager* _tmp2_; + CommandManager* _tmp3_; + Tag* _tmp4_; + DeleteTagCommand* _tmp5_; + DeleteTagCommand* _tmp6_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = app_window_get_command_manager (); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1333,10 +1333,10 @@ static void tag_page_on_delete_tag (TagPage* self) { static void tag_page_on_remove_tag_from_photos (TagPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; #line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1352,18 +1352,18 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp3_) { #line 1355 "TagPage.c" - CommandManager* _tmp4_ = NULL; - CommandManager* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - ViewCollection* _tmp12_ = NULL; - gint _tmp13_ = 0; - TagUntagPhotosCommand* _tmp14_ = NULL; - TagUntagPhotosCommand* _tmp15_ = NULL; + CommandManager* _tmp4_; + CommandManager* _tmp5_; + Tag* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + GeeList* _tmp9_; + GeeCollection* _tmp10_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; + gint _tmp13_; + TagUntagPhotosCommand* _tmp14_; + TagUntagPhotosCommand* _tmp15_; #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1411,19 +1411,19 @@ static void tag_page_class_init (TagPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_type_class_add_private (klass, sizeof (TagPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) tag_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) tag_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) tag_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) tag_page_real_get_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) tag_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) tag_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) tag_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) tag_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) tag_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) tag_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->switched_to = (void (*)(Page*)) tag_page_real_switched_to; + ((PageClass *) klass)->switched_to = (void (*) (Page *)) tag_page_real_switched_to; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) tag_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) tag_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (klass)->finalize = tag_page_finalize; #line 1430 "TagPage.c" @@ -1437,12 +1437,12 @@ static void tag_page_instance_init (TagPage * self) { } -static void tag_page_finalize (GObject* obj) { +static void tag_page_finalize (GObject * obj) { TagPage * self; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - TagSourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + TagSourceCollection* _tmp2_; + guint _tmp3_; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_PAGE, TagPage); #line 22 "/home/jens/Source/shotwell/src/tags/TagPage.vala" diff --git a/src/tags/Tags.c b/src/tags/Tags.c index d2d0690..f9f80dc 100644 --- a/src/tags/Tags.c +++ b/src/tags/Tags.c @@ -1,4 +1,4 @@ -/* Tags.c generated by valac 0.34.7, the Vala compiler +/* Tags.c generated by valac 0.36.6, the Vala compiler * generated from Tags.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. -- cgit v1.2.3