Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 46 insertions, 44 deletions

diff --git a/src/Upgrades.c b/src/Upgrades.c
index 1ebf302..a402c40 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1,4 +1,4 @@
-/* Upgrades.c generated by valac 0.34.4, the Vala compiler
+/* Upgrades.c generated by valac 0.34.7, the Vala compiler
  * generated from Upgrades.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -712,7 +712,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp2_ = _task_list;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp4_ = _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -999,7 +999,7 @@ static void upgrades_instance_init (Upgrades * self) {
 #line 12 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv->total_steps = (guint64) 0;
 #line 13 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	_tmp0_ = gee_linked_list_new (TYPE_UPGRADE_TASK, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_linked_list_new (TYPE_UPGRADE_TASK, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 13 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv->task_list = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1105,7 +1105,7 @@ GType upgrade_task_get_type (void) {
 static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	MimicsRemovalTask * self;
 	guint64 result = 0ULL;
-	guint64 _tmp5_ = 0ULL;
+	guint64 _tmp6_ = 0ULL;
 	GError * _inner_error_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
@@ -1152,21 +1152,23 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	__finally593:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1156 "Upgrades.c"
+		guint64 _tmp5_ = 0ULL;
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		g_clear_error (&_inner_error_);
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		return 0ULL;
-#line 1162 "Upgrades.c"
+		return _tmp5_;
+#line 1164 "Upgrades.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	_tmp5_ = self->priv->num_mimics;
+	_tmp6_ = self->priv->num_mimics;
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	result = _tmp5_;
+	result = _tmp6_;
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 1170 "Upgrades.c"
+#line 1172 "Upgrades.c"
 }
 
 
@@ -1175,7 +1177,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 	GError * _inner_error_ = NULL;
 #line 80 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
-#line 1179 "Upgrades.c"
+#line 1181 "Upgrades.c"
 	{
 		GFile* _tmp0_ = NULL;
 		ProgressMonitor _tmp1_ = NULL;
@@ -1194,7 +1196,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		delete_all_files (_tmp0_, NULL, _tmp1_, _tmp1__target, _tmp2_, NULL, &_inner_error_);
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1198 "Upgrades.c"
+#line 1200 "Upgrades.c"
 			goto __catch594_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1203,7 +1205,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_file_delete (_tmp3_, NULL, &_inner_error_);
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1207 "Upgrades.c"
+#line 1209 "Upgrades.c"
 			goto __catch594_g_error;
 		}
 	}
@@ -1225,7 +1227,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp5_);
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_error_free0 (e);
-#line 1229 "Upgrades.c"
+#line 1231 "Upgrades.c"
 	}
 	__finally594:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1236,7 +1238,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_clear_error (&_inner_error_);
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		return;
-#line 1240 "Upgrades.c"
+#line 1242 "Upgrades.c"
 	}
 }
 
@@ -1247,14 +1249,14 @@ MimicsRemovalTask* mimics_removal_task_construct (GType object_type) {
 	self = (MimicsRemovalTask*) g_object_new (object_type, NULL);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self;
-#line 1251 "Upgrades.c"
+#line 1253 "Upgrades.c"
 }
 
 
 MimicsRemovalTask* mimics_removal_task_new (void) {
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return mimics_removal_task_construct (TYPE_MIMICS_REMOVAL_TASK);
-#line 1258 "Upgrades.c"
+#line 1260 "Upgrades.c"
 }
 
 
@@ -1265,7 +1267,7 @@ static void mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) {
 	g_type_class_add_private (klass, sizeof (MimicsRemovalTaskPrivate));
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	G_OBJECT_CLASS (klass)->finalize = mimics_removal_task_finalize;
-#line 1269 "Upgrades.c"
+#line 1271 "Upgrades.c"
 }
 
 
@@ -1276,7 +1278,7 @@ static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface *
 	iface->get_step_count = (guint64 (*)(UpgradeTask*)) mimics_removal_task_real_get_step_count;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	iface->execute = (void (*)(UpgradeTask*, ProgressMonitor, void*)) mimics_removal_task_real_execute;
-#line 1280 "Upgrades.c"
+#line 1282 "Upgrades.c"
 }
 
 
@@ -1298,7 +1300,7 @@ static void mimics_removal_task_instance_init (MimicsRemovalTask * self) {
 	_g_object_unref0 (_tmp1_);
 #line 69 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv->num_mimics = (guint64) 0;
-#line 1302 "Upgrades.c"
+#line 1304 "Upgrades.c"
 }
 
 
@@ -1310,7 +1312,7 @@ static void mimics_removal_task_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->mimic_dir);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	G_OBJECT_CLASS (mimics_removal_task_parent_class)->finalize (obj);
-#line 1314 "Upgrades.c"
+#line 1316 "Upgrades.c"
 }
 
 
@@ -1336,7 +1338,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask);
 #line 95 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	num_raw_files = 0;
-#line 1340 "Upgrades.c"
+#line 1342 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
 		PhotoTable* _tmp0_ = NULL;
@@ -1363,7 +1365,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp4_ = _phr_list;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp6_ = _tmp5_;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1372,7 +1374,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 		_phr_index = -1;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
-#line 1376 "Upgrades.c"
+#line 1378 "Upgrades.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -1395,7 +1397,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 			if (!(_tmp8_ < _tmp9_)) {
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				break;
-#line 1399 "Upgrades.c"
+#line 1401 "Upgrades.c"
 			}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp10_ = _phr_list;
@@ -1413,27 +1415,27 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 			_tmp15_ = _tmp14_->file_format;
 #line 98 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp15_ == PHOTO_FILE_FORMAT_RAW) {
-#line 1417 "Upgrades.c"
+#line 1419 "Upgrades.c"
 				gint _tmp16_ = 0;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp16_ = num_raw_files;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				num_raw_files = _tmp16_ + 1;
-#line 1423 "Upgrades.c"
+#line 1425 "Upgrades.c"
 			}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_photo_row_unref0 (phr);
-#line 1427 "Upgrades.c"
+#line 1429 "Upgrades.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_phr_list);
-#line 1431 "Upgrades.c"
+#line 1433 "Upgrades.c"
 	}
 #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	result = (guint64) num_raw_files;
 #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 1437 "Upgrades.c"
+#line 1439 "Upgrades.c"
 }
 
 
@@ -1443,7 +1445,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask);
 #line 105 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_debug ("Upgrades.vala:105: Executing thumbnail deletion and fixup");
-#line 1447 "Upgrades.c"
+#line 1449 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
 		PhotoTable* _tmp0_ = NULL;
@@ -1470,7 +1472,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp4_ = _phr_list;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp6_ = _tmp5_;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1479,7 +1481,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 		_phr_index = -1;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
-#line 1483 "Upgrades.c"
+#line 1485 "Upgrades.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -1503,7 +1505,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 			if (!(_tmp8_ < _tmp9_)) {
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				break;
-#line 1507 "Upgrades.c"
+#line 1509 "Upgrades.c"
 			}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp10_ = _phr_list;
@@ -1521,7 +1523,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 			_tmp16_ = _tmp15_->file_format;
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp16_ == PHOTO_FILE_FORMAT_RAW) {
-#line 1525 "Upgrades.c"
+#line 1527 "Upgrades.c"
 				PhotoRow* _tmp17_ = NULL;
 				RawDeveloper _tmp18_ = 0;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1530,15 +1532,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 				_tmp18_ = _tmp17_->developer;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp13_ = _tmp18_ == RAW_DEVELOPER_CAMERA;
-#line 1534 "Upgrades.c"
+#line 1536 "Upgrades.c"
 			} else {
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp13_ = FALSE;
-#line 1538 "Upgrades.c"
+#line 1540 "Upgrades.c"
 			}
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp13_) {
-#line 1542 "Upgrades.c"
+#line 1544 "Upgrades.c"
 				LibraryPhotoSourceCollection* _tmp19_ = NULL;
 				PhotoRow* _tmp20_ = NULL;
 				PhotoID _tmp21_ = {0};
@@ -1558,15 +1560,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 				thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_g_object_unref0 (_tmp23_);
-#line 1562 "Upgrades.c"
+#line 1564 "Upgrades.c"
 			}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_photo_row_unref0 (phr);
-#line 1566 "Upgrades.c"
+#line 1568 "Upgrades.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_phr_list);
-#line 1570 "Upgrades.c"
+#line 1572 "Upgrades.c"
 	}
 }
 
@@ -1577,21 +1579,21 @@ FixupRawThumbnailsTask* fixup_raw_thumbnails_task_construct (GType object_type)
 	self = (FixupRawThumbnailsTask*) g_object_new (object_type, NULL);
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self;
-#line 1581 "Upgrades.c"
+#line 1583 "Upgrades.c"
 }
 
 
 FixupRawThumbnailsTask* fixup_raw_thumbnails_task_new (void) {
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return fixup_raw_thumbnails_task_construct (TYPE_FIXUP_RAW_THUMBNAILS_TASK);
-#line 1588 "Upgrades.c"
+#line 1590 "Upgrades.c"
 }
 
 
 static void fixup_raw_thumbnails_task_class_init (FixupRawThumbnailsTaskClass * klass) {
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	fixup_raw_thumbnails_task_parent_class = g_type_class_peek_parent (klass);
-#line 1595 "Upgrades.c"
+#line 1597 "Upgrades.c"
 }
 
 
@@ -1602,7 +1604,7 @@ static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIf
 	iface->get_step_count = (guint64 (*)(UpgradeTask*)) fixup_raw_thumbnails_task_real_get_step_count;
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	iface->execute = (void (*)(UpgradeTask*, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute;
-#line 1606 "Upgrades.c"
+#line 1608 "Upgrades.c"
 }