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/MediaPage.c | 86 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'src/MediaPage.c') diff --git a/src/MediaPage.c b/src/MediaPage.c index b62ca6f..a6f60b1 100644 --- a/src/MediaPage.c +++ b/src/MediaPage.c @@ -1,4 +1,4 @@ -/* MediaPage.c generated by valac 0.34.4, the Vala compiler +/* MediaPage.c generated by valac 0.34.7, the Vala compiler * generated from MediaPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2055,7 +2055,7 @@ static void media_source_item_class_init (MediaSourceItemClass * klass) { #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" g_type_class_add_private (klass, sizeof (MediaSourceItemPrivate)); #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((CheckerboardItemClass *) klass)->paint_image = media_source_item_real_paint_image; + ((CheckerboardItemClass *) klass)->paint_image = (void (*)(CheckerboardItem*, cairo_t*, GdkPixbuf*, GdkPoint*)) media_source_item_real_paint_image; #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (klass)->finalize = media_source_item_finalize; #line 2062 "MediaPage.c" @@ -6643,7 +6643,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) #line 930 "/home/jens/Source/shotwell/src/MediaPage.vala" need_warn = FALSE; #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala" - _tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala" to_set = _tmp4_; #line 6650 "MediaPage.c" @@ -6806,7 +6806,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd) #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp33_ = to_set; #line 945 "/home/jens/Source/shotwell/src/MediaPage.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 945 "/home/jens/Source/shotwell/src/MediaPage.vala" _tmp35_ = _tmp34_; #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala" @@ -8432,83 +8432,83 @@ static void media_page_class_init (MediaPageClass * klass) { #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" g_type_class_add_private (klass, sizeof (MediaPagePrivate)); #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = media_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) media_page_real_init_collect_ui_filenames; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->add_actions = media_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) media_page_real_add_actions; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->remove_actions = media_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) media_page_real_remove_actions; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->update_actions = media_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) media_page_real_update_actions; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((CheckerboardPageClass *) klass)->get_view_tracker = media_page_real_get_view_tracker; + ((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) media_page_real_get_view_tracker; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->on_mousewheel_up = media_page_real_on_mousewheel_up; + ((PageClass *) klass)->on_mousewheel_up = (gboolean (*)(Page*, GdkEventScroll*)) media_page_real_on_mousewheel_up; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->on_mousewheel_down = media_page_real_on_mousewheel_down; + ((PageClass *) klass)->on_mousewheel_down = (gboolean (*)(Page*, GdkEventScroll*)) media_page_real_on_mousewheel_down; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->on_app_key_pressed = media_page_real_on_app_key_pressed; + ((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) media_page_real_on_app_key_pressed; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->switched_to = media_page_real_switched_to; + ((PageClass *) klass)->switched_to = (void (*)(Page*)) media_page_real_switched_to; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((PageClass *) klass)->switching_from = media_page_real_switching_from; + ((PageClass *) klass)->switching_from = (void (*)(Page*)) media_page_real_switching_from; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_zoom_changed = media_page_real_on_zoom_changed; + ((MediaPageClass *) klass)->on_zoom_changed = (void (*)(MediaPage*)) media_page_real_on_zoom_changed; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_export = media_page_real_on_export; + ((MediaPageClass *) klass)->on_export = (void (*)(MediaPage*)) media_page_real_on_export; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_increase_size = media_page_real_on_increase_size; + ((MediaPageClass *) klass)->on_increase_size = (void (*)(MediaPage*)) media_page_real_on_increase_size; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_decrease_size = media_page_real_on_decrease_size; + ((MediaPageClass *) klass)->on_decrease_size = (void (*)(MediaPage*)) media_page_real_on_decrease_size; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_increase_rating = media_page_real_on_increase_rating; + ((MediaPageClass *) klass)->on_increase_rating = (void (*)(MediaPage*)) media_page_real_on_increase_rating; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_decrease_rating = media_page_real_on_decrease_rating; + ((MediaPageClass *) klass)->on_decrease_rating = (void (*)(MediaPage*)) media_page_real_on_decrease_rating; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_set_rating = media_page_real_on_set_rating; + ((MediaPageClass *) klass)->on_set_rating = (void (*)(MediaPage*, Rating)) media_page_real_on_set_rating; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_rate_rejected = media_page_real_on_rate_rejected; + ((MediaPageClass *) klass)->on_rate_rejected = (void (*)(MediaPage*)) media_page_real_on_rate_rejected; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_rate_unrated = media_page_real_on_rate_unrated; + ((MediaPageClass *) klass)->on_rate_unrated = (void (*)(MediaPage*)) media_page_real_on_rate_unrated; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_rate_one = media_page_real_on_rate_one; + ((MediaPageClass *) klass)->on_rate_one = (void (*)(MediaPage*)) media_page_real_on_rate_one; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_rate_two = media_page_real_on_rate_two; + ((MediaPageClass *) klass)->on_rate_two = (void (*)(MediaPage*)) media_page_real_on_rate_two; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_rate_three = media_page_real_on_rate_three; + ((MediaPageClass *) klass)->on_rate_three = (void (*)(MediaPage*)) media_page_real_on_rate_three; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_rate_four = media_page_real_on_rate_four; + ((MediaPageClass *) klass)->on_rate_four = (void (*)(MediaPage*)) media_page_real_on_rate_four; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_rate_five = media_page_real_on_rate_five; + ((MediaPageClass *) klass)->on_rate_five = (void (*)(MediaPage*)) media_page_real_on_rate_five; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_move_to_trash = media_page_real_on_move_to_trash; + ((MediaPageClass *) klass)->on_move_to_trash = (void (*)(MediaPage*)) media_page_real_on_move_to_trash; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_edit_title = media_page_real_on_edit_title; + ((MediaPageClass *) klass)->on_edit_title = (void (*)(MediaPage*)) media_page_real_on_edit_title; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_edit_comment = media_page_real_on_edit_comment; + ((MediaPageClass *) klass)->on_edit_comment = (void (*)(MediaPage*)) media_page_real_on_edit_comment; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_display_titles = media_page_real_on_display_titles; + ((MediaPageClass *) klass)->on_display_titles = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_titles; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_display_comments = media_page_real_on_display_comments; + ((MediaPageClass *) klass)->on_display_comments = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_comments; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_display_ratings = media_page_real_on_display_ratings; + ((MediaPageClass *) klass)->on_display_ratings = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_ratings; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_display_tags = media_page_real_on_display_tags; + ((MediaPageClass *) klass)->on_display_tags = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_display_tags; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = media_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) media_page_real_get_config_photos_sort; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = media_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) media_page_real_set_config_photos_sort; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->on_sort_changed = media_page_real_on_sort_changed; + ((MediaPageClass *) klass)->on_sort_changed = (void (*)(MediaPage*, GSimpleAction*, GVariant*)) media_page_real_on_sort_changed; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->developer_changed = media_page_real_developer_changed; + ((MediaPageClass *) klass)->developer_changed = (void (*)(MediaPage*, RawDeveloper)) media_page_real_developer_changed; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((CheckerboardPageClass *) klass)->set_display_titles = media_page_real_set_display_titles; + ((CheckerboardPageClass *) klass)->set_display_titles = (void (*)(CheckerboardPage*, gboolean)) media_page_real_set_display_titles; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((CheckerboardPageClass *) klass)->set_display_comments = media_page_real_set_display_comments; + ((CheckerboardPageClass *) klass)->set_display_comments = (void (*)(CheckerboardPage*, gboolean)) media_page_real_set_display_comments; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((GtkWidgetClass *) klass)->destroy = media_page_real_destroy; + ((GtkWidgetClass *) klass)->destroy = (void (*)(GtkWidget*)) media_page_real_destroy; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" - ((MediaPageClass *) klass)->create_thumbnail = media_page_real_create_thumbnail; + ((MediaPageClass *) klass)->create_thumbnail = (DataView* (*)(MediaPage*, DataSource*)) media_page_real_create_thumbnail; #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala" G_OBJECT_CLASS (klass)->finalize = media_page_finalize; #line 8515 "MediaPage.c" -- cgit v1.2.3