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/core/DataSourceTypes.c | 89 ++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 42 deletions(-) (limited to 'src/core/DataSourceTypes.c') diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c index ea7d98a..a71a3c3 100644 --- a/src/core/DataSourceTypes.c +++ b/src/core/DataSourceTypes.c @@ -1,4 +1,4 @@ -/* DataSourceTypes.c generated by valac 0.34.4, the Vala compiler +/* DataSourceTypes.c generated by valac 0.34.7, the Vala compiler * generated from DataSourceTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -727,15 +727,15 @@ static void thumbnail_source_class_init (ThumbnailSourceClass * klass) { #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" thumbnail_source_parent_class = g_type_class_peek_parent (klass); #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = thumbnail_source_real_notify_thumbnail_altered; + ((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = (void (*)(ThumbnailSource*)) thumbnail_source_real_notify_thumbnail_altered; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->get_thumbnail = thumbnail_source_real_get_thumbnail; + ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_get_thumbnail; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->create_thumbnail = thumbnail_source_real_create_thumbnail; + ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_create_thumbnail; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->get_representative_id = thumbnail_source_real_get_representative_id; + ((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*)(ThumbnailSource*)) thumbnail_source_real_get_representative_id; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = thumbnail_source_real_get_preferred_thumbnail_format; + ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) thumbnail_source_real_get_preferred_thumbnail_format; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" ((ThumbnailSourceClass *) klass)->thumbnail_altered = thumbnail_source_real_thumbnail_altered; #line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" @@ -813,9 +813,9 @@ static void photo_source_class_init (PhotoSourceClass * klass) { #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" photo_source_parent_class = g_type_class_peek_parent (klass); #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((PhotoSourceClass *) klass)->get_metadata = photo_source_real_get_metadata; + ((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*)(PhotoSource*)) photo_source_real_get_metadata; #line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((PhotoSourceClass *) klass)->get_pixbuf = photo_source_real_get_pixbuf; + ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) photo_source_real_get_pixbuf; #line 820 "DataSourceTypes.c" } @@ -883,11 +883,12 @@ EventSource* event_source_construct (GType object_type, gint64 object_id) { static time_t event_source_real_get_start_time (EventSource* self) { + time_t _tmp0_ = 0; #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_start_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - return 0; -#line 891 "DataSourceTypes.c" + return _tmp0_; +#line 892 "DataSourceTypes.c" } @@ -896,16 +897,17 @@ time_t event_source_get_start_time (EventSource* self) { g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_start_time (self); -#line 900 "DataSourceTypes.c" +#line 901 "DataSourceTypes.c" } static time_t event_source_real_get_end_time (EventSource* self) { + time_t _tmp0_ = 0; #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_end_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - return 0; -#line 909 "DataSourceTypes.c" + return _tmp0_; +#line 911 "DataSourceTypes.c" } @@ -914,16 +916,17 @@ time_t event_source_get_end_time (EventSource* self) { g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_end_time (self); -#line 918 "DataSourceTypes.c" +#line 920 "DataSourceTypes.c" } static guint64 event_source_real_get_total_filesize (EventSource* self) { + guint64 _tmp0_ = 0ULL; #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_total_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - return 0ULL; -#line 927 "DataSourceTypes.c" + return _tmp0_; +#line 930 "DataSourceTypes.c" } @@ -932,16 +935,17 @@ guint64 event_source_get_total_filesize (EventSource* self) { g_return_val_if_fail (IS_EVENT_SOURCE (self), 0ULL); #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_total_filesize (self); -#line 936 "DataSourceTypes.c" +#line 939 "DataSourceTypes.c" } static gint event_source_real_get_media_count (EventSource* self) { + gint _tmp0_ = 0; #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_get_media_count'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - return 0; -#line 945 "DataSourceTypes.c" + return _tmp0_; +#line 949 "DataSourceTypes.c" } @@ -950,7 +954,7 @@ gint event_source_get_media_count (EventSource* self) { g_return_val_if_fail (IS_EVENT_SOURCE (self), 0); #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_media_count (self); -#line 954 "DataSourceTypes.c" +#line 958 "DataSourceTypes.c" } @@ -959,7 +963,7 @@ static GeeCollection* event_source_real_get_media (EventSource* self) { g_critical ("Type `%s' does not implement abstract method `event_source_get_media'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 963 "DataSourceTypes.c" +#line 967 "DataSourceTypes.c" } @@ -968,7 +972,7 @@ GeeCollection* event_source_get_media (EventSource* self) { g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL); #line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_media (self); -#line 972 "DataSourceTypes.c" +#line 976 "DataSourceTypes.c" } @@ -977,7 +981,7 @@ static gchar* event_source_real_get_comment (EventSource* self) { g_critical ("Type `%s' does not implement abstract method `event_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return NULL; -#line 981 "DataSourceTypes.c" +#line 985 "DataSourceTypes.c" } @@ -986,16 +990,17 @@ gchar* event_source_get_comment (EventSource* self) { g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL); #line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->get_comment (self); -#line 990 "DataSourceTypes.c" +#line 994 "DataSourceTypes.c" } static gboolean event_source_real_set_comment (EventSource* self, const gchar* comment) { + gboolean _tmp0_ = FALSE; #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" g_critical ("Type `%s' does not implement abstract method `event_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - return FALSE; -#line 999 "DataSourceTypes.c" + return _tmp0_; +#line 1004 "DataSourceTypes.c" } @@ -1004,7 +1009,7 @@ gboolean event_source_set_comment (EventSource* self, const gchar* comment) { g_return_val_if_fail (IS_EVENT_SOURCE (self), FALSE); #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return EVENT_SOURCE_GET_CLASS (self)->set_comment (self, comment); -#line 1008 "DataSourceTypes.c" +#line 1013 "DataSourceTypes.c" } @@ -1012,20 +1017,20 @@ static void event_source_class_init (EventSourceClass * klass) { #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" event_source_parent_class = g_type_class_peek_parent (klass); #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_start_time = event_source_real_get_start_time; + ((EventSourceClass *) klass)->get_start_time = (time_t (*)(EventSource*)) event_source_real_get_start_time; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_end_time = event_source_real_get_end_time; + ((EventSourceClass *) klass)->get_end_time = (time_t (*)(EventSource*)) event_source_real_get_end_time; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_total_filesize = event_source_real_get_total_filesize; + ((EventSourceClass *) klass)->get_total_filesize = (guint64 (*)(EventSource*)) event_source_real_get_total_filesize; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_media_count = event_source_real_get_media_count; + ((EventSourceClass *) klass)->get_media_count = (gint (*)(EventSource*)) event_source_real_get_media_count; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_media = event_source_real_get_media; + ((EventSourceClass *) klass)->get_media = (GeeCollection* (*)(EventSource*)) event_source_real_get_media; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->get_comment = event_source_real_get_comment; + ((EventSourceClass *) klass)->get_comment = (gchar* (*)(EventSource*)) event_source_real_get_comment; #line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" - ((EventSourceClass *) klass)->set_comment = event_source_real_set_comment; -#line 1029 "DataSourceTypes.c" + ((EventSourceClass *) klass)->set_comment = (gboolean (*)(EventSource*, const gchar*)) event_source_real_set_comment; +#line 1034 "DataSourceTypes.c" } @@ -1050,7 +1055,7 @@ gboolean container_source_has_links (ContainerSource* self) { g_return_val_if_fail (IS_CONTAINER_SOURCE (self), FALSE); #line 95 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return CONTAINER_SOURCE_GET_INTERFACE (self)->has_links (self); -#line 1054 "DataSourceTypes.c" +#line 1059 "DataSourceTypes.c" } @@ -1059,7 +1064,7 @@ SourceBacklink* container_source_get_backlink (ContainerSource* self) { g_return_val_if_fail (IS_CONTAINER_SOURCE (self), NULL); #line 97 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" return CONTAINER_SOURCE_GET_INTERFACE (self)->get_backlink (self); -#line 1063 "DataSourceTypes.c" +#line 1068 "DataSourceTypes.c" } @@ -1068,7 +1073,7 @@ void container_source_break_link (ContainerSource* self, DataSource* source) { g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 99 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->break_link (self, source); -#line 1072 "DataSourceTypes.c" +#line 1077 "DataSourceTypes.c" } @@ -1077,7 +1082,7 @@ void container_source_break_link_many (ContainerSource* self, GeeCollection* sou g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 101 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->break_link_many (self, sources); -#line 1081 "DataSourceTypes.c" +#line 1086 "DataSourceTypes.c" } @@ -1086,7 +1091,7 @@ void container_source_establish_link (ContainerSource* self, DataSource* source) g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 103 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link (self, source); -#line 1090 "DataSourceTypes.c" +#line 1095 "DataSourceTypes.c" } @@ -1095,7 +1100,7 @@ void container_source_establish_link_many (ContainerSource* self, GeeCollection* g_return_if_fail (IS_CONTAINER_SOURCE (self)); #line 105 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link_many (self, sources); -#line 1099 "DataSourceTypes.c" +#line 1104 "DataSourceTypes.c" } @@ -1106,7 +1111,7 @@ static void container_source_base_init (ContainerSourceIface * iface) { if (!initialized) { #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala" initialized = TRUE; -#line 1110 "DataSourceTypes.c" +#line 1115 "DataSourceTypes.c" } } -- cgit v1.2.3