Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 25 insertions, 25 deletions

diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index bf8c368..c67c8cc 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1,4 +1,4 @@
-/* CheckerboardLayout.c generated by valac 0.34.4, the Vala compiler
+/* CheckerboardLayout.c generated by valac 0.34.7, the Vala compiler
  * generated from CheckerboardLayout.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -5592,33 +5592,33 @@ static void checkerboard_item_class_init (CheckerboardItemClass * klass) {
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardItemPrivate));
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataObjectClass *) klass)->get_name = checkerboard_item_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) checkerboard_item_real_get_name;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataObjectClass *) klass)->notify_membership_changed = checkerboard_item_real_notify_membership_changed;
+	((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) checkerboard_item_real_notify_membership_changed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataObjectClass *) klass)->notify_collection_property_set = checkerboard_item_real_notify_collection_property_set;
+	((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) checkerboard_item_real_notify_collection_property_set;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->exposed = checkerboard_item_real_exposed;
+	((CheckerboardItemClass *) klass)->exposed = (void (*)(CheckerboardItem*)) checkerboard_item_real_exposed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->unexposed = checkerboard_item_real_unexposed;
+	((CheckerboardItemClass *) klass)->unexposed = (void (*)(CheckerboardItem*)) checkerboard_item_real_unexposed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->is_exposed = checkerboard_item_real_is_exposed;
+	((CheckerboardItemClass *) klass)->is_exposed = (gboolean (*)(CheckerboardItem*)) checkerboard_item_real_is_exposed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->paint_shadow = checkerboard_item_real_paint_shadow;
+	((CheckerboardItemClass *) klass)->paint_shadow = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint, gfloat)) checkerboard_item_real_paint_shadow;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->paint_border = checkerboard_item_real_paint_border;
+	((CheckerboardItemClass *) klass)->paint_border = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint)) checkerboard_item_real_paint_border;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->paint_image = checkerboard_item_real_paint_image;
+	((CheckerboardItemClass *) klass)->paint_image = (void (*)(CheckerboardItem*, cairo_t*, GdkPixbuf*, GdkPoint*)) checkerboard_item_real_paint_image;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_top_left_trinket = checkerboard_item_real_get_top_left_trinket;
+	((CheckerboardItemClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_top_left_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_top_right_trinket = checkerboard_item_real_get_top_right_trinket;
+	((CheckerboardItemClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_top_right_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = checkerboard_item_real_get_bottom_left_trinket;
+	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_bottom_left_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((CheckerboardItemClass *) klass)->get_bottom_right_trinket = checkerboard_item_real_get_bottom_right_trinket;
+	((CheckerboardItemClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) checkerboard_item_real_get_bottom_right_trinket;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((DataViewClass *) klass)->visibility_changed = checkerboard_item_real_visibility_changed;
+	((DataViewClass *) klass)->visibility_changed = (void (*)(DataView*, gboolean)) checkerboard_item_real_visibility_changed;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_checkerboard_item_get_property;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -6440,7 +6440,7 @@ void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem*
 #line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
 #line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	collection = _tmp0_;
 #line 1049 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8065,7 +8065,7 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 #line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (area != NULL, NULL);
 #line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	intersects = _tmp0_;
 #line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9060,7 +9060,7 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 #line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (caller != NULL);
 #line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	new_exposed_items = _tmp0_;
 #line 1502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -12236,17 +12236,17 @@ static void checkerboard_layout_class_init (CheckerboardLayoutClass * klass) {
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardLayoutPrivate));
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->map = checkerboard_layout_real_map;
+	((GtkWidgetClass *) klass)->map = (void (*)(GtkWidget*)) checkerboard_layout_real_map;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->size_allocate = checkerboard_layout_real_size_allocate;
+	((GtkWidgetClass *) klass)->size_allocate = (void (*)(GtkWidget*, GtkAllocation*)) checkerboard_layout_real_size_allocate;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->draw = checkerboard_layout_real_draw;
+	((GtkWidgetClass *) klass)->draw = (gboolean (*)(GtkWidget*, cairo_t*)) checkerboard_layout_real_draw;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->query_tooltip = checkerboard_layout_real_query_tooltip;
+	((GtkWidgetClass *) klass)->query_tooltip = (gboolean (*)(GtkWidget*, gint, gint, gboolean, GtkTooltip*)) checkerboard_layout_real_query_tooltip;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->focus_in_event = checkerboard_layout_real_focus_in_event;
+	((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) checkerboard_layout_real_focus_in_event;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	((GtkWidgetClass *) klass)->focus_out_event = checkerboard_layout_real_focus_out_event;
+	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*)(GtkWidget*, GdkEventFocus*)) checkerboard_layout_real_focus_out_event;
 #line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_layout_finalize;
 #line 12252 "CheckerboardLayout.c"
@@ -12269,7 +12269,7 @@ static void checkerboard_layout_instance_init (CheckerboardLayout * self) {
 #line 852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->_item_rows_size_ = self->priv->item_rows_length1;
 #line 853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposed_items = _tmp1_;
 #line 854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"