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/Event.c | 86 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'src/Event.c') diff --git a/src/Event.c b/src/Event.c index af882ab..9f49ff5 100644 --- a/src/Event.c +++ b/src/Event.c @@ -1,4 +1,4 @@ -/* Event.c generated by valac 0.34.4, the Vala compiler +/* Event.c generated by valac 0.34.7, the Vala compiler * generated from Event.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1494,7 +1494,7 @@ static GeeCollection* event_source_collection_real_get_containers_holding_source #line 1495 "Event.c" } #line 63 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 63 "/home/jens/Source/shotwell/src/Event.vala" list = _tmp3_; #line 64 "/home/jens/Source/shotwell/src/Event.vala" @@ -1753,9 +1753,9 @@ static void event_source_collection_no_event_view_manager_class_init (EventSourc #line 12 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_no_event_view_manager_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/src/Event.vala" - ((ViewManagerClass *) klass)->include_in_view = event_source_collection_no_event_view_manager_real_include_in_view; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) event_source_collection_no_event_view_manager_real_include_in_view; #line 12 "/home/jens/Source/shotwell/src/Event.vala" - ((ViewManagerClass *) klass)->create_view = event_source_collection_no_event_view_manager_real_create_view; + ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) event_source_collection_no_event_view_manager_real_create_view; #line 1760 "Event.c" } @@ -1784,11 +1784,11 @@ static void event_source_collection_class_init (EventSourceCollectionClass * kla #line 7 "/home/jens/Source/shotwell/src/Event.vala" g_type_class_add_private (klass, sizeof (EventSourceCollectionPrivate)); #line 7 "/home/jens/Source/shotwell/src/Event.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = event_source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) event_source_collection_real_holds_type_of_source; #line 7 "/home/jens/Source/shotwell/src/Event.vala" - ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = event_source_collection_real_get_containers_holding_source; + ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) event_source_collection_real_get_containers_holding_source; #line 7 "/home/jens/Source/shotwell/src/Event.vala" - ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = event_source_collection_real_convert_backlink_to_container; + ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) event_source_collection_real_convert_backlink_to_container; #line 7 "/home/jens/Source/shotwell/src/Event.vala" g_signal_new ("no_event_collection_altered", TYPE_EVENT_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 1795 "Event.c" @@ -1989,7 +1989,7 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob #line 190 "/home/jens/Source/shotwell/src/Event.vala" event_source_ids = _tmp17_; #line 192 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp18_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/Event.vala" event_thumbs = _tmp18_; #line 1996 "Event.c" @@ -2120,7 +2120,7 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob #line 206 "/home/jens/Source/shotwell/src/Event.vala" _tmp47_ = event_thumbs; #line 206 "/home/jens/Source/shotwell/src/Event.vala" - _tmp48_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp48_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 206 "/home/jens/Source/shotwell/src/Event.vala" _tmp49_ = _tmp48_; #line 206 "/home/jens/Source/shotwell/src/Event.vala" @@ -2474,11 +2474,11 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { #line 272 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_init (_tmp2_); #line 275 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 275 "/home/jens/Source/shotwell/src/Event.vala" events = _tmp3_; #line 276 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 276 "/home/jens/Source/shotwell/src/Event.vala" unlinked = _tmp4_; #line 278 "/home/jens/Source/shotwell/src/Event.vala" @@ -2490,7 +2490,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { #line 279 "/home/jens/Source/shotwell/src/Event.vala" _tmp7_ = event_rows; #line 279 "/home/jens/Source/shotwell/src/Event.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 279 "/home/jens/Source/shotwell/src/Event.vala" _tmp9_ = _tmp8_; #line 279 "/home/jens/Source/shotwell/src/Event.vala" @@ -2769,7 +2769,7 @@ void event_attach_many (Event* self, GeeCollection* media) { #line 331 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 332 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 332 "/home/jens/Source/shotwell/src/Event.vala" views = _tmp0_; #line 2776 "Event.c" @@ -2899,7 +2899,7 @@ void event_detach_many (Event* self, GeeCollection* media) { #line 346 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 347 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 347 "/home/jens/Source/shotwell/src/Event.vala" views = _tmp0_; #line 2906 "Event.c" @@ -3098,7 +3098,7 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) { #line 369 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (GEE_IS_ITERABLE (views), NULL); #line 370 "/home/jens/Source/shotwell/src/Event.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 370 "/home/jens/Source/shotwell/src/Event.vala" media = _tmp0_; #line 3105 "Event.c" @@ -3272,7 +3272,7 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) { #line 393 "/home/jens/Source/shotwell/src/Event.vala" _tmp10_ = _current_source_list; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 393 "/home/jens/Source/shotwell/src/Event.vala" _tmp12_ = _tmp11_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" @@ -3993,11 +3993,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so #line 519 "/home/jens/Source/shotwell/src/Event.vala" self->priv->unlinking = TRUE; #line 521 "/home/jens/Source/shotwell/src/Event.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 521 "/home/jens/Source/shotwell/src/Event.vala" photos = _tmp0_; #line 522 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 522 "/home/jens/Source/shotwell/src/Event.vala" videos = _tmp1_; #line 523 "/home/jens/Source/shotwell/src/Event.vala" @@ -4171,11 +4171,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection #line 549 "/home/jens/Source/shotwell/src/Event.vala" self->priv->relinking = TRUE; #line 551 "/home/jens/Source/shotwell/src/Event.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 551 "/home/jens/Source/shotwell/src/Event.vala" photos = _tmp0_; #line 552 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 552 "/home/jens/Source/shotwell/src/Event.vala" videos = _tmp1_; #line 553 "/home/jens/Source/shotwell/src/Event.vala" @@ -5521,7 +5521,7 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_ #line 692 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_VIEW_COLLECTION (events_so_far)); #line 693 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 693 "/home/jens/Source/shotwell/src/Event.vala" to_add = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 5527 "Event.c" @@ -7295,7 +7295,7 @@ static void event_event_snapshot_class_init (EventEventSnapshotClass * klass) { #line 105 "/home/jens/Source/shotwell/src/Event.vala" g_type_class_add_private (klass, sizeof (EventEventSnapshotPrivate)); #line 105 "/home/jens/Source/shotwell/src/Event.vala" - ((SourceSnapshotClass *) klass)->notify_broken = event_event_snapshot_real_notify_broken; + ((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) event_event_snapshot_real_notify_broken; #line 7299 "Event.c" } @@ -7305,7 +7305,7 @@ static void event_event_snapshot_instance_init (EventEventSnapshot * self) { #line 105 "/home/jens/Source/shotwell/src/Event.vala" self->priv = EVENT_EVENT_SNAPSHOT_GET_PRIVATE (self); #line 108 "/home/jens/Source/shotwell/src/Event.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 108 "/home/jens/Source/shotwell/src/Event.vala" self->priv->attached_sources = _tmp0_; #line 7311 "Event.c" @@ -7434,7 +7434,7 @@ static void event_event_proxy_class_init (EventEventProxyClass * klass) { #line 153 "/home/jens/Source/shotwell/src/Event.vala" event_event_proxy_parent_class = g_type_class_peek_parent (klass); #line 153 "/home/jens/Source/shotwell/src/Event.vala" - ((SourceProxyClass *) klass)->reconstitute = event_event_proxy_real_reconstitute; + ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) event_event_proxy_real_reconstitute; #line 7438 "Event.c" } @@ -7461,43 +7461,43 @@ static void event_class_init (EventClass * klass) { #line 94 "/home/jens/Source/shotwell/src/Event.vala" g_type_class_add_private (klass, sizeof (EventPrivate)); #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataSourceClass *) klass)->get_typename = event_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) event_real_get_typename; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataSourceClass *) klass)->get_instance_id = event_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) event_real_get_instance_id; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((ThumbnailSourceClass *) klass)->get_representative_id = event_real_get_representative_id; + ((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*)(ThumbnailSource*)) event_real_get_representative_id; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = event_real_get_preferred_thumbnail_format; + ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) event_real_get_preferred_thumbnail_format; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((ThumbnailSourceClass *) klass)->create_thumbnail = event_real_create_thumbnail; + ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) event_real_create_thumbnail; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataSourceClass *) klass)->notify_relinking = event_real_notify_relinking; + ((DataSourceClass *) klass)->notify_relinking = (void (*)(DataSource*, SourceCollection*)) event_real_notify_relinking; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataSourceClass *) klass)->save_snapshot = event_real_save_snapshot; + ((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) event_real_save_snapshot; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataSourceClass *) klass)->equals = event_real_equals; + ((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) event_real_equals; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataObjectClass *) klass)->to_string = event_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) event_real_to_string; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataObjectClass *) klass)->get_name = event_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) event_real_get_name; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((EventSourceClass *) klass)->get_comment = event_real_get_comment; + ((EventSourceClass *) klass)->get_comment = (gchar* (*)(EventSource*)) event_real_get_comment; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((EventSourceClass *) klass)->set_comment = event_real_set_comment; + ((EventSourceClass *) klass)->set_comment = (gboolean (*)(EventSource*, const gchar*)) event_real_set_comment; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((EventSourceClass *) klass)->get_start_time = event_real_get_start_time; + ((EventSourceClass *) klass)->get_start_time = (time_t (*)(EventSource*)) event_real_get_start_time; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((EventSourceClass *) klass)->get_end_time = event_real_get_end_time; + ((EventSourceClass *) klass)->get_end_time = (time_t (*)(EventSource*)) event_real_get_end_time; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((EventSourceClass *) klass)->get_total_filesize = event_real_get_total_filesize; + ((EventSourceClass *) klass)->get_total_filesize = (guint64 (*)(EventSource*)) event_real_get_total_filesize; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((EventSourceClass *) klass)->get_media_count = event_real_get_media_count; + ((EventSourceClass *) klass)->get_media_count = (gint (*)(EventSource*)) event_real_get_media_count; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((EventSourceClass *) klass)->get_media = event_real_get_media; + ((EventSourceClass *) klass)->get_media = (GeeCollection* (*)(EventSource*)) event_real_get_media; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((ThumbnailSourceClass *) klass)->get_thumbnail = event_real_get_thumbnail; + ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) event_real_get_thumbnail; #line 94 "/home/jens/Source/shotwell/src/Event.vala" - ((DataSourceClass *) klass)->destroy = event_real_destroy; + ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) event_real_destroy; #line 94 "/home/jens/Source/shotwell/src/Event.vala" G_OBJECT_CLASS (klass)->finalize = event_finalize; #line 7503 "Event.c" -- cgit v1.2.3