From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/sidebar/Branch.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/sidebar/Branch.c') diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c index 798377f..26b9a21 100644 --- a/src/sidebar/Branch.c +++ b/src/sidebar/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.4, the Vala compiler +/* Branch.c generated by valac 0.34.7, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1116,7 +1116,7 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) #line 1117 "Branch.c" } #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList); #line 1123 "Branch.c" @@ -1854,7 +1854,7 @@ static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranc #line 1855 "Branch.c" GeeTreeSet* _tmp2_ = NULL; #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); + _tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1894,7 +1894,7 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr #line 75 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (_tmp0_ != NULL, "children != null"); #line 77 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); + _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); #line 77 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 81 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2270,7 +2270,7 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side #line 138 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (old_index >= 0, "old_index >= 0"); #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp3_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); + _tmp3_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2327,7 +2327,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool #line 2328 "Branch.c" } #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); + _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" reordered = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 163 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2778,7 +2778,7 @@ static void sidebar_branch_instance_init (SidebarBranch * self) { #line 190 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->priv->shown = TRUE; #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - _tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->priv->map = _tmp0_; #line 2785 "Branch.c" -- cgit v1.2.3