New upstream version 0.25.2upstream/0.25.2

1 files changed, 48 insertions, 48 deletions

diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index de6ff94..7527ed1 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -1,4 +1,4 @@
-/* DirectoryMonitor.c generated by valac 0.34.2, the Vala compiler
+/* DirectoryMonitor.c generated by valac 0.32.1, the Vala compiler
  * generated from DirectoryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2099,13 +2099,13 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = NULL;
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = NULL;
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2948,13 +2948,13 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = NULL;
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = NULL;
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_data_->_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3785,7 +3785,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 3784 "DirectoryMonitor.c"
-				goto __catch479_g_error;
+				goto __catch477_g_error;
 			}
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp15_ = NULL;
@@ -3801,8 +3801,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			_g_object_unref0 (_data_->_tmp11_);
 #line 3799 "DirectoryMonitor.c"
 		}
-		goto __finally479;
-		__catch479_g_error:
+		goto __finally477;
+		__catch477_g_error:
 		{
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->err = _data_->_inner_error_;
@@ -3858,7 +3858,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			return FALSE;
 #line 3856 "DirectoryMonitor.c"
 		}
-		__finally479:
+		__finally477:
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4089,7 +4089,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 4088 "DirectoryMonitor.c"
-			goto __catch480_g_error;
+			goto __catch478_g_error;
 		}
 		{
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4129,7 +4129,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_g_object_unref0 (_data_->enumerator);
 #line 4128 "DirectoryMonitor.c"
-					goto __catch480_g_error;
+					goto __catch478_g_error;
 				}
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp55_ = NULL;
@@ -4250,7 +4250,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_data_->_tmp72_ = NULL;
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp72_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->file_map);
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4306,7 +4306,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_data_->_tmp81_ = NULL;
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp81_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->dir_map);
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4371,8 +4371,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		_g_object_unref0 (_data_->enumerator);
 #line 4369 "DirectoryMonitor.c"
 	}
-	goto __finally480;
-	__catch480_g_error:
+	goto __finally478;
+	__catch478_g_error:
 	{
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->err2 = _data_->_inner_error_;
@@ -4432,7 +4432,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		return FALSE;
 #line 4430 "DirectoryMonitor.c"
 	}
-	__finally480:
+	__finally478:
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5058,7 +5058,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5057 "DirectoryMonitor.c"
-			goto __catch481_g_error;
+			goto __catch479_g_error;
 		}
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp12_ = _tmp9_;
@@ -5072,8 +5072,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_object_unref0 (_tmp9_);
 #line 5070 "DirectoryMonitor.c"
 	}
-	goto __finally481;
-	__catch481_g_error:
+	goto __finally479;
+	__catch479_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp13_ = NULL;
@@ -5111,7 +5111,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		return result;
 #line 5109 "DirectoryMonitor.c"
 	}
-	__finally481:
+	__finally479:
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7539,7 +7539,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = source;
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile));
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_FILE, GFile));
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	source_file = _tmp1_;
 #line 7540 "DirectoryMonitor.c"
@@ -7557,7 +7557,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7554 "DirectoryMonitor.c"
-			goto __catch482_g_error;
+			goto __catch480_g_error;
 		}
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = _tmp2_;
@@ -7571,8 +7571,8 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_object_unref0 (_tmp2_);
 #line 7567 "DirectoryMonitor.c"
 	}
-	goto __finally482;
-	__catch482_g_error:
+	goto __finally480;
+	__catch480_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -7593,7 +7593,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_error_free0 (err);
 #line 7589 "DirectoryMonitor.c"
 	}
-	__finally482:
+	__finally480:
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8696,7 +8696,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8693 "DirectoryMonitor.c"
-			goto __catch483_g_error;
+			goto __catch481_g_error;
 		}
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = _tmp3_;
@@ -8710,8 +8710,8 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (_tmp3_);
 #line 8706 "DirectoryMonitor.c"
 	}
-	goto __finally483;
-	__catch483_g_error:
+	goto __finally481;
+	__catch481_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp8_ = NULL;
@@ -8747,7 +8747,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		return result;
 #line 8743 "DirectoryMonitor.c"
 	}
-	__finally483:
+	__finally481:
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9165,7 +9165,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 #line 9160 "DirectoryMonitor.c"
 						GeeArrayList* _tmp17_ = NULL;
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-						_tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_tmp17_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_g_object_unref0 (pruned);
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9637,11 +9637,11 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self);
 #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->map = _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->id_map = _tmp1_;
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9797,43 +9797,43 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = directory_monitor_finalize;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 9834 "DirectoryMonitor.c"