Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

13 files changed, 91 insertions, 91 deletions

diff --git a/src/library/Branch.c b/src/library/Branch.c
index be0fedc..9a3d452 100644
--- a/src/library/Branch.c
+++ b/src/library/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.
@@ -1767,11 +1767,11 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_photos_entry_parent_class = g_type_class_peek_parent (klass);
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = library_photos_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_name;
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_photos_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_icon;
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = library_photos_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_create_page;
 #line 1776 "Branch.c"
 }
 
@@ -2116,9 +2116,9 @@ static void library_main_page_class_init (LibraryMainPageClass * klass) {
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_main_page_parent_class = g_type_class_peek_parent (klass);
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = library_main_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = library_main_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) library_main_page_real_set_config_photos_sort;
 #line 2123 "Branch.c"
 }
 
diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 09dafd0..849e784 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.34.4, the Vala compiler
+/* FlaggedPage.c generated by valac 0.34.7, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1087,7 +1087,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = flagged_page_flagged_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view;
 #line 1092 "FlaggedPage.c"
 }
 
@@ -1142,7 +1142,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = flagged_page_flagged_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) flagged_page_flagged_search_view_filter_real_get_criteria;
 #line 1147 "FlaggedPage.c"
 }
 
@@ -1169,11 +1169,11 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_type_class_add_private (klass, sizeof (FlaggedPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = flagged_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) flagged_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = flagged_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) flagged_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = flagged_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) flagged_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize;
 #line 1180 "FlaggedPage.c"
diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 5ed7427..38df252 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from FlaggedSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -742,11 +742,11 @@ static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntry
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = library_flagged_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_flagged_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = library_flagged_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_flagged_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_flagged_sidebar_entry_finalize;
 #line 753 "FlaggedSidebarEntry.c"
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index b64083a..a2794b7 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.34.4, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.34.7, the Vala compiler
  * generated from ImportQueuePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -845,7 +845,7 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = self->priv->queue;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp17_ = _tmp16_;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -874,7 +874,7 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -907,7 +907,7 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = self->priv->queue;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp6_ = _tmp5_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -944,7 +944,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -982,7 +982,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp7_ = _batch_import_list;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp9_ = _tmp8_;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1317,7 +1317,7 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->queue;
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = _tmp3_;
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1391,7 +1391,7 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp27_ = self->priv->queue;
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp29_ = _tmp28_;
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1481,11 +1481,11 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_type_class_add_private (klass, sizeof (ImportQueuePagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = import_queue_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) import_queue_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->add_actions = import_queue_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->remove_actions = import_queue_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1503,11 +1503,11 @@ static void import_queue_page_instance_init (ImportQueuePage * self) {
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv = IMPORT_QUEUE_PAGE_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->queue = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 11 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->cancel_unallowed = _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index fb038d9..cd17564 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from ImportQueueSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -468,11 +468,11 @@ static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSid
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	library_import_queue_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = library_import_queue_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_import_queue_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = library_import_queue_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_create_page;
 #line 477 "ImportQueueSidebarEntry.c"
 }
 
diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index bfaa3ed..41a084f 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.34.4, the Vala compiler
+/* LastImportPage.c generated by valac 0.34.7, the Vala compiler
  * generated from LastImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1119,7 +1119,7 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate));
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = last_import_page_last_import_view_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view;
 #line 1124 "LastImportPage.c"
 }
 
@@ -1159,9 +1159,9 @@ static void last_import_page_class_init (LastImportPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_type_class_add_private (klass, sizeof (LastImportPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = last_import_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) last_import_page_real_get_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = last_import_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) last_import_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize;
 #line 1168 "LastImportPage.c"
diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index d30c4af..5032c53 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from LastImportSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -503,11 +503,11 @@ static void library_last_import_sidebar_entry_class_init (LibraryLastImportSideb
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	library_last_import_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = library_last_import_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_last_import_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = library_last_import_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_last_import_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_last_import_sidebar_entry_finalize;
 #line 514 "LastImportSidebarEntry.c"
diff --git a/src/library/Library.c b/src/library/Library.c
index 0e29d27..bb7907e 100644
--- a/src/library/Library.c
+++ b/src/library/Library.c
@@ -1,4 +1,4 @@
-/* Library.c generated by valac 0.34.4, the Vala compiler
+/* Library.c generated by valac 0.34.7, the Vala compiler
  * generated from Library.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index e304171..526b38f 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.34.4, the Vala compiler
+/* LibraryWindow.c generated by valac 0.34.7, the Vala compiler
  * generated from LibraryWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gee.h>
-#include <gio/gio.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <gphoto2/gphoto2-camera.h>
 #include <gphoto.h>
@@ -4395,7 +4395,7 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	to_remove = _tmp0_;
 #line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5596,7 +5596,7 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 #line 5596 "LibraryWindow.c"
 	}
 #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp18_;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5687,7 +5687,7 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = jobs;
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = _tmp34_;
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9257,11 +9257,11 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowFullscreenPhotoPagePrivate));
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->switched_to = library_window_fullscreen_photo_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switched_to;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->switching_from = library_window_fullscreen_photo_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*)(Page*)) library_window_fullscreen_photo_page_real_switching_from;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize;
 #line 9267 "LibraryWindow.c"
@@ -9310,35 +9310,35 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->add_actions = library_window_real_add_actions;
+	((AppWindowClass *) klass)->add_actions = (void (*)(AppWindow*)) library_window_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageWindowClass *) klass)->switched_pages = library_window_real_switched_pages;
+	((PageWindowClass *) klass)->switched_pages = (void (*)(PageWindow*, Page*, Page*)) library_window_real_switched_pages;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->show_all = library_window_real_show_all;
+	((GtkWidgetClass *) klass)->show_all = (void (*)(GtkWidget*)) library_window_real_show_all;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->get_app_role = library_window_real_get_app_role;
+	((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) library_window_real_get_app_role;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->on_quit = library_window_real_on_quit;
+	((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) library_window_real_on_quit;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->on_fullscreen = library_window_real_on_fullscreen;
+	((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) library_window_real_on_fullscreen;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->update_common_action_availability = library_window_real_update_common_action_availability;
+	((AppWindowClass *) klass)->update_common_action_availability = (void (*)(AppWindow*, Page*, Page*)) library_window_real_update_common_action_availability;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->update_common_actions = library_window_real_update_common_actions;
+	((AppWindowClass *) klass)->update_common_actions = (void (*)(AppWindow*, Page*, gint, gint)) library_window_real_update_common_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->drag_motion = library_window_real_drag_motion;
+	((GtkWidgetClass *) klass)->drag_motion = (gboolean (*)(GtkWidget*, GdkDragContext*, gint, gint, guint)) library_window_real_drag_motion;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->drag_data_received = library_window_real_drag_data_received;
+	((GtkWidgetClass *) klass)->drag_data_received = (void (*)(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) library_window_real_drag_data_received;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((PageWindowClass *) klass)->set_current_page = library_window_real_set_current_page;
+	((PageWindowClass *) klass)->set_current_page = (void (*)(PageWindow*, Page*)) library_window_real_set_current_page;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = library_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) library_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_finalize;
 #line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
 #line 9344 "LibraryWindow.c"
@@ -9423,7 +9423,7 @@ static void library_window_instance_init (LibraryWindow * self) {
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = TRUE;
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_map = _tmp11_;
 #line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index 1117bcd..f789adf 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.34.4, the Vala compiler
+/* OfflinePage.c generated by valac 0.34.7, the Vala compiler
  * generated from OfflinePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1404,11 +1404,11 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 #line 1405 "OfflinePage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	photos = _tmp23_;
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	videos = _tmp24_;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1617,7 +1617,7 @@ static void offline_page_offline_search_view_filter_class_init (OfflinePageOffli
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = offline_page_offline_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) offline_page_offline_search_view_filter_real_get_criteria;
 #line 1622 "OfflinePage.c"
 }
 
@@ -1644,17 +1644,17 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_type_class_add_private (klass, sizeof (OfflinePagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = offline_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) offline_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->add_actions = offline_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) offline_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->remove_actions = offline_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) offline_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = offline_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) offline_page_real_get_view_tracker;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->update_actions = offline_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) offline_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = offline_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) offline_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = offline_page_finalize;
 #line 1661 "OfflinePage.c"
diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index 1a19cd3..215616d 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -593,11 +593,11 @@ static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntry
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = library_offline_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_offline_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = library_offline_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_offline_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_offline_sidebar_entry_finalize;
 #line 604 "OfflineSidebarEntry.c"
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index c108bba..b323541 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.34.4, the Vala compiler
+/* TrashPage.c generated by valac 0.34.7, the Vala compiler
  * generated from TrashPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1550,7 +1550,7 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = trash_page_trash_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) trash_page_trash_search_view_filter_real_get_criteria;
 #line 1555 "TrashPage.c"
 }
 
@@ -1577,19 +1577,19 @@ static void trash_page_class_init (TrashPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_type_class_add_private (klass, sizeof (TrashPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = trash_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) trash_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->add_actions = trash_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) trash_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->remove_actions = trash_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) trash_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = trash_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) trash_page_real_get_view_tracker;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->update_actions = trash_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) trash_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = trash_page_real_get_view_empty_message;
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) trash_page_real_get_view_empty_message;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = trash_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) trash_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_page_finalize;
 #line 1596 "TrashPage.c"
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index 0eca1b9..8e620d7 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from TrashSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -696,11 +696,11 @@ static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClas
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	library_trash_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = library_trash_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_name;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_trash_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = library_trash_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_trash_sidebar_entry_finalize;
 #line 707 "TrashSidebarEntry.c"