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/CollectionPage.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/CollectionPage.c') diff --git a/src/CollectionPage.c b/src/CollectionPage.c index 991dadb..d44af2c 100644 --- a/src/CollectionPage.c +++ b/src/CollectionPage.c @@ -1,4 +1,4 @@ -/* CollectionPage.c generated by valac 0.34.4, the Vala compiler +/* CollectionPage.c generated by valac 0.34.7, the Vala compiler * generated from CollectionPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1451,7 +1451,7 @@ static void collection_view_manager_class_init (CollectionViewManagerClass * kla #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_type_class_add_private (klass, sizeof (CollectionViewManagerPrivate)); #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((ViewManagerClass *) klass)->create_view = collection_view_manager_real_create_view; + ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) collection_view_manager_real_create_view; #line 1456 "CollectionPage.c" } @@ -5867,7 +5867,7 @@ void collection_page_on_set_background (CollectionPage* self) { #line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_return_if_fail (IS_COLLECTION_PAGE (self)); #line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala" photos = _tmp0_; #line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5889,7 +5889,7 @@ void collection_page_on_set_background (CollectionPage* self) { #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp6_ = photos; #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp8_ = _tmp7_; #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -5969,7 +5969,7 @@ void collection_page_on_set_background (CollectionPage* self) { #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp23_ = photos; #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" - _tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" _tmp25_ = _tmp24_; #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala" @@ -6459,7 +6459,7 @@ static void collection_page_collection_search_view_filter_class_init (Collection #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" collection_page_collection_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((SearchViewFilterClass *) klass)->get_criteria = collection_page_collection_search_view_filter_real_get_criteria; + ((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) collection_page_collection_search_view_filter_real_get_criteria; #line 6464 "CollectionPage.c" } @@ -6486,31 +6486,31 @@ static void collection_page_class_init (CollectionPageClass * klass) { #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" g_type_class_add_private (klass, sizeof (CollectionPagePrivate)); #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->get_toolbar = collection_page_real_get_toolbar; + ((PageClass *) klass)->get_toolbar = (GtkToolbar* (*)(Page*)) collection_page_real_get_toolbar; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = collection_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) collection_page_real_init_collect_ui_filenames; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->add_actions = collection_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) collection_page_real_add_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->remove_actions = collection_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) collection_page_real_remove_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->init_collect_injection_groups = collection_page_real_init_collect_injection_groups; + ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) collection_page_real_init_collect_injection_groups; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->init_actions = collection_page_real_init_actions; + ((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) collection_page_real_init_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->update_actions = collection_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) collection_page_real_update_actions; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((CheckerboardPageClass *) klass)->on_item_activated = collection_page_real_on_item_activated; + ((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) collection_page_real_on_item_activated; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->on_app_key_pressed = collection_page_real_on_app_key_pressed; + ((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_app_key_pressed; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((MediaPageClass *) klass)->on_export = collection_page_real_on_export; + ((MediaPageClass *) klass)->on_export = (void (*)(MediaPage*)) collection_page_real_on_export; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->on_ctrl_pressed = collection_page_real_on_ctrl_pressed; + ((PageClass *) klass)->on_ctrl_pressed = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_ctrl_pressed; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((PageClass *) klass)->on_ctrl_released = collection_page_real_on_ctrl_released; + ((PageClass *) klass)->on_ctrl_released = (gboolean (*)(Page*, GdkEventKey*)) collection_page_real_on_ctrl_released; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" - ((CheckerboardPageClass *) klass)->get_search_view_filter = collection_page_real_get_search_view_filter; + ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) collection_page_real_get_search_view_filter; #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala" G_OBJECT_CLASS (klass)->finalize = collection_page_finalize; #line 6517 "CollectionPage.c" -- cgit v1.2.3