Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 14 insertions, 14 deletions

diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index c31c92e..7617f27 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.34.4, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.34.7, the Vala compiler
  * generated from EventsDirectoryPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2241,7 +2241,7 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewManagerClass *) klass)->create_view = events_directory_page_event_directory_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
 #line 2246 "EventsDirectoryPage.c"
 }
 
@@ -2438,9 +2438,9 @@ static void events_directory_page_events_directory_search_view_filter_class_init
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	events_directory_page_events_directory_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = events_directory_page_events_directory_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewFilterClass *) klass)->predicate = events_directory_page_events_directory_search_view_filter_real_predicate;
+	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
 #line 2445 "EventsDirectoryPage.c"
 }
 
@@ -2467,23 +2467,23 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (EventsDirectoryPagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = events_directory_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) events_directory_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->add_actions = events_directory_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->remove_actions = events_directory_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_actions = events_directory_page_real_init_actions;
+	((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_init_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->update_actions = events_directory_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = events_directory_page_real_get_view_empty_message;
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_view_empty_message;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_filter_no_match_message = events_directory_page_real_get_filter_no_match_message;
+	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_filter_no_match_message;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->on_item_activated = events_directory_page_real_on_item_activated;
+	((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) events_directory_page_real_on_item_activated;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = events_directory_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) events_directory_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize;
 #line 2490 "EventsDirectoryPage.c"
@@ -3017,7 +3017,7 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
 #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((ViewManagerClass *) klass)->include_in_view = sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
 #line 3022 "EventsDirectoryPage.c"
 }