Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 23 insertions, 23 deletions

diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c
index 638b755..d7410e2 100644
--- a/src/VideoMonitor.c
+++ b/src/VideoMonitor.c
@@ -1,4 +1,4 @@
-/* VideoMonitor.c generated by valac 0.34.4, the Vala compiler
+/* VideoMonitor.c generated by valac 0.34.7, the Vala compiler
  * generated from VideoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -665,11 +665,11 @@ static void video_updates_class_init (VideoUpdatesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (VideoUpdatesPrivate));
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((VideoUpdatesClass *) klass)->set_check_interpretable = video_updates_real_set_check_interpretable;
+	((VideoUpdatesClass *) klass)->set_check_interpretable = (void (*)(VideoUpdates*, gboolean)) video_updates_real_set_check_interpretable;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->mark_online = video_updates_real_mark_online;
+	((MonitorableUpdatesClass *) klass)->mark_online = (void (*)(MonitorableUpdates*)) video_updates_real_mark_online;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_all_updated = video_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) video_updates_real_is_all_updated;
 #line 674 "VideoMonitor.c"
 }
 
@@ -1050,7 +1050,7 @@ static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), NULL);
 #line 119 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	_tmp0_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 119 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	matched = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 120 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1890,7 +1890,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp11_ = check;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-				_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp13_ = _tmp12_;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1947,7 +1947,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1948 "VideoMonitor.c"
 					GeeArrayList* _tmp20_ = NULL;
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-					_tmp20_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_tmp20_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 					_g_object_unref0 (check);
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1999,7 +1999,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp27_ = check;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-		_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp29_ = _tmp28_;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2017,7 +2017,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp33_ = check;
 #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.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 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp35_ = _tmp34_;
 #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2041,7 +2041,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp38_ = _video_list;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-			_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp40_ = _tmp39_;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2222,7 +2222,7 @@ static void video_monitor_video_interpretable_check_job_class_init (VideoMonitor
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = video_monitor_video_interpretable_check_job_finalize;
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = video_monitor_video_interpretable_check_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) video_monitor_video_interpretable_check_job_real_execute;
 #line 2227 "VideoMonitor.c"
 }
 
@@ -2266,29 +2266,29 @@ static void video_monitor_class_init (VideoMonitorClass * klass) {
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (VideoMonitorPrivate));
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->create_updates = video_monitor_real_create_updates;
+	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) video_monitor_real_create_updates;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->get_media_source_collection = video_monitor_real_get_media_source_collection;
+	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) video_monitor_real_get_media_source_collection;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->is_file_represented = video_monitor_real_is_file_represented;
+	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_is_file_represented;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_discovered = video_monitor_real_notify_file_discovered;
+	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) video_monitor_real_notify_file_discovered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->candidates_for_unknown_file = video_monitor_real_candidates_for_unknown_file;
+	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) video_monitor_real_candidates_for_unknown_file;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_created = video_monitor_real_notify_file_created;
+	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) video_monitor_real_notify_file_created;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_moved = video_monitor_real_notify_file_moved;
+	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) video_monitor_real_notify_file_moved;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_altered = video_monitor_real_notify_file_altered;
+	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_altered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_attributes_altered = video_monitor_real_notify_file_attributes_altered;
+	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_attributes_altered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_alteration_completed = video_monitor_real_notify_file_alteration_completed;
+	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) video_monitor_real_notify_file_alteration_completed;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_deleted = video_monitor_real_notify_file_deleted;
+	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_deleted;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->process_updates = video_monitor_real_process_updates;
+	((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) video_monitor_real_process_updates;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_monitor_finalize;
 #line 2295 "VideoMonitor.c"