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/Tree.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/sidebar/Tree.c') 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" -- cgit v1.2.3