diff options
Diffstat (limited to 'src/sidebar')
| -rw-r--r-- | src/sidebar/Branch.c | 14 | ||||
| -rw-r--r-- | src/sidebar/Entry.c | 2 | ||||
| -rw-r--r-- | src/sidebar/Sidebar.c | 2 | ||||
| -rw-r--r-- | src/sidebar/Tree.c | 24 | ||||
| -rw-r--r-- | src/sidebar/common.c | 12 |
5 files changed, 27 insertions, 27 deletions
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" diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c index 8edbd4c..1456a05 100644 --- a/src/sidebar/Entry.c +++ b/src/sidebar/Entry.c @@ -1,4 +1,4 @@ -/* Entry.c generated by valac 0.34.4, the Vala compiler +/* Entry.c generated by valac 0.34.7, the Vala compiler * generated from Entry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c index f7f7009..9bffe74 100644 --- a/src/sidebar/Sidebar.c +++ b/src/sidebar/Sidebar.c @@ -1,4 +1,4 @@ -/* Sidebar.c generated by valac 0.34.4, the Vala compiler +/* Sidebar.c generated by valac 0.34.7, the Vala compiler * generated from Sidebar.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c index f63fbe0..31d8b38 100644 --- a/src/sidebar/Tree.c +++ b/src/sidebar/Tree.c @@ -1,4 +1,4 @@ -/* Tree.c generated by valac 0.34.4, the Vala compiler +/* Tree.c generated by valac 0.34.7, the Vala compiler * generated from Tree.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3699,7 +3699,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt #line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper)); #line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" children = _tmp0_; #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -3778,7 +3778,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = _child_wrapper_list; #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = _tmp17_; #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7611,19 +7611,19 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) { #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_type_class_add_private (klass, sizeof (SidebarTreePrivate)); #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - ((SidebarTreeClass *) klass)->accept_cursor_changed = sidebar_tree_real_accept_cursor_changed; + ((SidebarTreeClass *) klass)->accept_cursor_changed = (gboolean (*)(SidebarTree*)) sidebar_tree_real_accept_cursor_changed; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - ((GtkTreeViewClass *) klass)->cursor_changed = sidebar_tree_real_cursor_changed; + ((GtkTreeViewClass *) klass)->cursor_changed = (void (*)(GtkTreeView*)) sidebar_tree_real_cursor_changed; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - ((GtkWidgetClass *) klass)->button_press_event = sidebar_tree_real_button_press_event; + ((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) sidebar_tree_real_button_press_event; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - ((GtkWidgetClass *) klass)->key_press_event = sidebar_tree_real_key_press_event; + ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) sidebar_tree_real_key_press_event; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - ((GtkWidgetClass *) klass)->drag_data_get = sidebar_tree_real_drag_data_get; + ((GtkWidgetClass *) klass)->drag_data_get = (void (*)(GtkWidget*, GdkDragContext*, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_get; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - ((GtkWidgetClass *) klass)->drag_data_received = sidebar_tree_real_drag_data_received; + ((GtkWidgetClass *) klass)->drag_data_received = (void (*)(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_received; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - ((GtkWidgetClass *) klass)->drag_motion = sidebar_tree_real_drag_motion; + ((GtkWidgetClass *) klass)->drag_motion = (gboolean (*)(GtkWidget*, GdkDragContext*, gint, gint, guint)) sidebar_tree_real_drag_motion; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_tree_finalize; #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7662,11 +7662,11 @@ static void sidebar_tree_instance_init (SidebarTree * self) { #line 65 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->text_entry = NULL; #line 66 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 66 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->entry_map = _tmp2_; #line 68 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = gee_hash_map_new (SIDEBAR_TYPE_BRANCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_map_new (SIDEBAR_TYPE_BRANCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->branches = _tmp3_; #line 69 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" diff --git a/src/sidebar/common.c b/src/sidebar/common.c index 582e3a9..4a8f7f4 100644 --- a/src/sidebar/common.c +++ b/src/sidebar/common.c @@ -1,4 +1,4 @@ -/* common.c generated by valac 0.34.4, the Vala compiler +/* common.c generated by valac 0.34.7, the Vala compiler * generated from common.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -848,15 +848,15 @@ static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass * #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" g_type_class_add_private (klass, sizeof (SidebarSimplePageEntryPrivate)); #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = sidebar_simple_page_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_name; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = sidebar_simple_page_entry_real_get_sidebar_tooltip; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_tooltip; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = sidebar_simple_page_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_icon; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" - ((SidebarSimplePageEntryClass *) klass)->to_string = sidebar_simple_page_entry_real_to_string; + ((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_to_string; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = sidebar_simple_page_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_create_page; #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_simple_page_entry_finalize; #line 863 "common.c" |