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/threads/BackgroundJob.c | 200 ++++++++++++++++++++++---------------------- src/threads/Semaphore.c | 22 ++--- src/threads/Threads.c | 2 +- src/threads/Workers.c | 95 ++++++++++----------- 4 files changed, 161 insertions(+), 158 deletions(-) (limited to 'src/threads') diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c index ec7c78f..cfb54d3 100644 --- a/src/threads/BackgroundJob.c +++ b/src/threads/BackgroundJob.c @@ -1,4 +1,4 @@ -/* BackgroundJob.c generated by valac 0.34.4, the Vala compiler +/* BackgroundJob.c generated by valac 0.34.7, the Vala compiler * generated from BackgroundJob.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1206,19 +1206,19 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback, static gboolean background_job_on_notification_ready (BackgroundJob* self) { gboolean result = FALSE; BackgroundJobNotificationJob* notification_job = NULL; - BackgroundJobNotificationJob* _tmp7_ = NULL; BackgroundJobNotificationJob* _tmp8_ = NULL; - NotificationCallback _tmp9_ = NULL; - void* _tmp9__target = NULL; - BackgroundJobNotificationJob* _tmp10_ = NULL; - BackgroundJob* _tmp11_ = NULL; - BackgroundJobNotificationJob* _tmp12_ = NULL; - NotificationObject* _tmp13_ = NULL; + BackgroundJobNotificationJob* _tmp9_ = NULL; + NotificationCallback _tmp10_ = NULL; + void* _tmp10__target = NULL; + BackgroundJobNotificationJob* _tmp11_ = NULL; + BackgroundJob* _tmp12_ = NULL; + BackgroundJobNotificationJob* _tmp13_ = NULL; + NotificationObject* _tmp14_ = NULL; InterlockedNotificationObject* interlocked = NULL; - BackgroundJobNotificationJob* _tmp14_ = NULL; - NotificationObject* _tmp15_ = NULL; - InterlockedNotificationObject* _tmp16_ = NULL; + BackgroundJobNotificationJob* _tmp15_ = NULL; + NotificationObject* _tmp16_ = NULL; InterlockedNotificationObject* _tmp17_ = NULL; + InterlockedNotificationObject* _tmp18_ = NULL; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE); @@ -1239,7 +1239,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp1_ = background_job_notify_queue; #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp3_ = _tmp2_; #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1269,6 +1269,8 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { } #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1273 "BackgroundJob.c" + gboolean _tmp7_ = FALSE; #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _background_job_notification_job_unref0 (notification_job); #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" @@ -1276,49 +1278,49 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_clear_error (&_inner_error_); #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - return FALSE; -#line 1281 "BackgroundJob.c" + return _tmp7_; +#line 1283 "BackgroundJob.c" } } #line 231 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp7_ = notification_job; + _tmp8_ = notification_job; #line 231 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _vala_assert (_tmp7_ != NULL, "notification_job != null"); + _vala_assert (_tmp8_ != NULL, "notification_job != null"); #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp8_ = notification_job; + _tmp9_ = notification_job; #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp9_ = _tmp8_->callback; + _tmp10_ = _tmp9_->callback; #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp9__target = _tmp8_->callback_target; + _tmp10__target = _tmp9_->callback_target; #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp10_ = notification_job; + _tmp11_ = notification_job; #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp11_ = _tmp10_->background_job; + _tmp12_ = _tmp11_->background_job; #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp12_ = notification_job; + _tmp13_ = notification_job; #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp13_ = _tmp12_->user; + _tmp14_ = _tmp13_->user; #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp9_ (_tmp11_, _tmp13_, _tmp9__target); + _tmp10_ (_tmp12_, _tmp14_, _tmp10__target); #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp14_ = notification_job; + _tmp15_ = notification_job; #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp15_ = _tmp14_->user; + _tmp16_ = _tmp15_->user; #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp16_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_INTERLOCKED_NOTIFICATION_OBJECT) ? ((InterlockedNotificationObject*) _tmp15_) : NULL); + _tmp17_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_INTERLOCKED_NOTIFICATION_OBJECT) ? ((InterlockedNotificationObject*) _tmp16_) : NULL); #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - interlocked = _tmp16_; + interlocked = _tmp17_; #line 237 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp17_ = interlocked; + _tmp18_ = interlocked; #line 237 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - if (_tmp17_ != NULL) { -#line 1316 "BackgroundJob.c" - InterlockedNotificationObject* _tmp18_ = NULL; + if (_tmp18_ != NULL) { +#line 1318 "BackgroundJob.c" + InterlockedNotificationObject* _tmp19_ = NULL; #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp18_ = interlocked; + _tmp19_ = interlocked; #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - interlocked_notification_object_internal_completed (_tmp18_); -#line 1322 "BackgroundJob.c" + interlocked_notification_object_internal_completed (_tmp19_); +#line 1324 "BackgroundJob.c" } #line 240 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" result = FALSE; @@ -1328,7 +1330,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) { _background_job_notification_job_unref0 (notification_job); #line 240 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return result; -#line 1332 "BackgroundJob.c" +#line 1334 "BackgroundJob.c" } @@ -1372,21 +1374,21 @@ static BackgroundJobNotificationJob* background_job_notification_job_construct ( self->user = _tmp4_; #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return self; -#line 1376 "BackgroundJob.c" +#line 1378 "BackgroundJob.c" } static BackgroundJobNotificationJob* background_job_notification_job_new (NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user) { #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return background_job_notification_job_construct (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, callback, callback_target, background_job, user); -#line 1383 "BackgroundJob.c" +#line 1385 "BackgroundJob.c" } static void background_job_value_notification_job_init (GValue* value) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1390 "BackgroundJob.c" +#line 1392 "BackgroundJob.c" } @@ -1395,7 +1397,7 @@ static void background_job_value_notification_job_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_unref (value->data[0].v_pointer); -#line 1399 "BackgroundJob.c" +#line 1401 "BackgroundJob.c" } } @@ -1405,11 +1407,11 @@ static void background_job_value_notification_job_copy_value (const GValue* src_ if (src_value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = background_job_notification_job_ref (src_value->data[0].v_pointer); -#line 1409 "BackgroundJob.c" +#line 1411 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = NULL; -#line 1413 "BackgroundJob.c" +#line 1415 "BackgroundJob.c" } } @@ -1417,37 +1419,37 @@ static void background_job_value_notification_job_copy_value (const GValue* src_ static gpointer background_job_value_notification_job_peek_pointer (const GValue* value) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1421 "BackgroundJob.c" +#line 1423 "BackgroundJob.c" } static gchar* background_job_value_notification_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (collect_values[0].v_pointer) { -#line 1428 "BackgroundJob.c" +#line 1430 "BackgroundJob.c" BackgroundJobNotificationJob* object; object = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (object->parent_instance.g_class == NULL) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1435 "BackgroundJob.c" +#line 1437 "BackgroundJob.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1439 "BackgroundJob.c" +#line 1441 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = background_job_notification_job_ref (object); -#line 1443 "BackgroundJob.c" +#line 1445 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1447 "BackgroundJob.c" +#line 1449 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1451 "BackgroundJob.c" +#line 1453 "BackgroundJob.c" } @@ -1458,25 +1460,25 @@ static gchar* background_job_value_notification_job_lcopy_value (const GValue* v if (!object_p) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1462 "BackgroundJob.c" +#line 1464 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = NULL; -#line 1468 "BackgroundJob.c" +#line 1470 "BackgroundJob.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = value->data[0].v_pointer; -#line 1472 "BackgroundJob.c" +#line 1474 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = background_job_notification_job_ref (value->data[0].v_pointer); -#line 1476 "BackgroundJob.c" +#line 1478 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1480 "BackgroundJob.c" +#line 1482 "BackgroundJob.c" } @@ -1490,7 +1492,7 @@ static GParamSpec* background_job_param_spec_notification_job (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return G_PARAM_SPEC (spec); -#line 1494 "BackgroundJob.c" +#line 1496 "BackgroundJob.c" } @@ -1499,7 +1501,7 @@ static gpointer background_job_value_get_notification_job (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB), NULL); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1503 "BackgroundJob.c" +#line 1505 "BackgroundJob.c" } @@ -1519,17 +1521,17 @@ static void background_job_value_set_notification_job (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_ref (value->data[0].v_pointer); -#line 1523 "BackgroundJob.c" +#line 1525 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1527 "BackgroundJob.c" +#line 1529 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_unref (old); -#line 1533 "BackgroundJob.c" +#line 1535 "BackgroundJob.c" } } @@ -1548,17 +1550,17 @@ static void background_job_value_take_notification_job (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = v_object; -#line 1552 "BackgroundJob.c" +#line 1554 "BackgroundJob.c" } else { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1556 "BackgroundJob.c" +#line 1558 "BackgroundJob.c" } #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notification_job_unref (old); -#line 1562 "BackgroundJob.c" +#line 1564 "BackgroundJob.c" } } @@ -1568,14 +1570,14 @@ static void background_job_notification_job_class_init (BackgroundJobNotificatio background_job_notification_job_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" ((BackgroundJobNotificationJobClass *) klass)->finalize = background_job_notification_job_finalize; -#line 1572 "BackgroundJob.c" +#line 1574 "BackgroundJob.c" } static void background_job_notification_job_instance_init (BackgroundJobNotificationJob * self) { #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->ref_count = 1; -#line 1579 "BackgroundJob.c" +#line 1581 "BackgroundJob.c" } @@ -1589,7 +1591,7 @@ static void background_job_notification_job_finalize (BackgroundJobNotificationJ _background_job_unref0 (self->background_job); #line 86 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _notification_object_unref0 (self->user); -#line 1593 "BackgroundJob.c" +#line 1595 "BackgroundJob.c" } @@ -1614,7 +1616,7 @@ static gpointer background_job_notification_job_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return instance; -#line 1618 "BackgroundJob.c" +#line 1620 "BackgroundJob.c" } @@ -1627,7 +1629,7 @@ static void background_job_notification_job_unref (gpointer instance) { BACKGROUND_JOB_NOTIFICATION_JOB_GET_CLASS (self)->finalize (self); #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1631 "BackgroundJob.c" +#line 1633 "BackgroundJob.c" } } @@ -1635,7 +1637,7 @@ static void background_job_notification_job_unref (gpointer instance) { static void value_background_job_init (GValue* value) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1639 "BackgroundJob.c" +#line 1641 "BackgroundJob.c" } @@ -1644,7 +1646,7 @@ static void value_background_job_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_unref (value->data[0].v_pointer); -#line 1648 "BackgroundJob.c" +#line 1650 "BackgroundJob.c" } } @@ -1654,11 +1656,11 @@ static void value_background_job_copy_value (const GValue* src_value, GValue* de if (src_value->data[0].v_pointer) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = background_job_ref (src_value->data[0].v_pointer); -#line 1658 "BackgroundJob.c" +#line 1660 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" dest_value->data[0].v_pointer = NULL; -#line 1662 "BackgroundJob.c" +#line 1664 "BackgroundJob.c" } } @@ -1666,37 +1668,37 @@ static void value_background_job_copy_value (const GValue* src_value, GValue* de static gpointer value_background_job_peek_pointer (const GValue* value) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1670 "BackgroundJob.c" +#line 1672 "BackgroundJob.c" } static gchar* value_background_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (collect_values[0].v_pointer) { -#line 1677 "BackgroundJob.c" +#line 1679 "BackgroundJob.c" BackgroundJob* object; object = collect_values[0].v_pointer; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (object->parent_instance.g_class == NULL) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1684 "BackgroundJob.c" +#line 1686 "BackgroundJob.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1688 "BackgroundJob.c" +#line 1690 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = background_job_ref (object); -#line 1692 "BackgroundJob.c" +#line 1694 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1696 "BackgroundJob.c" +#line 1698 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1700 "BackgroundJob.c" +#line 1702 "BackgroundJob.c" } @@ -1707,25 +1709,25 @@ static gchar* value_background_job_lcopy_value (const GValue* value, guint n_col if (!object_p) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1711 "BackgroundJob.c" +#line 1713 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (!value->data[0].v_pointer) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = NULL; -#line 1717 "BackgroundJob.c" +#line 1719 "BackgroundJob.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = value->data[0].v_pointer; -#line 1721 "BackgroundJob.c" +#line 1723 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" *object_p = background_job_ref (value->data[0].v_pointer); -#line 1725 "BackgroundJob.c" +#line 1727 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return NULL; -#line 1729 "BackgroundJob.c" +#line 1731 "BackgroundJob.c" } @@ -1739,7 +1741,7 @@ GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return G_PARAM_SPEC (spec); -#line 1743 "BackgroundJob.c" +#line 1745 "BackgroundJob.c" } @@ -1748,7 +1750,7 @@ gpointer value_get_background_job (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB), NULL); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return value->data[0].v_pointer; -#line 1752 "BackgroundJob.c" +#line 1754 "BackgroundJob.c" } @@ -1768,17 +1770,17 @@ void value_set_background_job (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_ref (value->data[0].v_pointer); -#line 1772 "BackgroundJob.c" +#line 1774 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1776 "BackgroundJob.c" +#line 1778 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_unref (old); -#line 1782 "BackgroundJob.c" +#line 1784 "BackgroundJob.c" } } @@ -1797,17 +1799,17 @@ void value_take_background_job (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = v_object; -#line 1801 "BackgroundJob.c" +#line 1803 "BackgroundJob.c" } else { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" value->data[0].v_pointer = NULL; -#line 1805 "BackgroundJob.c" +#line 1807 "BackgroundJob.c" } #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" if (old) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_unref (old); -#line 1811 "BackgroundJob.c" +#line 1813 "BackgroundJob.c" } } @@ -1821,16 +1823,16 @@ static void background_job_class_init (BackgroundJobClass * klass) { #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_type_class_add_private (klass, sizeof (BackgroundJobPrivate)); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - ((BackgroundJobClass *) klass)->execute = background_job_real_execute; + ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) background_job_real_execute; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - ((BackgroundJobClass *) klass)->get_priority = background_job_real_get_priority; + ((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) background_job_real_get_priority; #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_rec_mutex_init (&__lock_background_job_notify_queue); #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" - _tmp0_ = gee_array_list_new (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, (GBoxedCopyFunc) background_job_notification_job_ref, background_job_notification_job_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, (GBoxedCopyFunc) background_job_notification_job_ref, (GDestroyNotify) background_job_notification_job_unref, NULL, NULL, NULL); #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" background_job_notify_queue = _tmp0_; -#line 1834 "BackgroundJob.c" +#line 1836 "BackgroundJob.c" } @@ -1847,7 +1849,7 @@ static void background_job_instance_init (BackgroundJob * self) { self->priv->notification_priority = G_PRIORITY_DEFAULT_IDLE; #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" self->ref_count = 1; -#line 1851 "BackgroundJob.c" +#line 1853 "BackgroundJob.c" } @@ -1865,7 +1867,7 @@ static void background_job_finalize (BackgroundJob* obj) { _background_job_unref0 (self->priv->self); #line 103 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _abstract_semaphore_unref0 (self->priv->semaphore); -#line 1869 "BackgroundJob.c" +#line 1871 "BackgroundJob.c" } @@ -1890,7 +1892,7 @@ gpointer background_job_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" return instance; -#line 1894 "BackgroundJob.c" +#line 1896 "BackgroundJob.c" } @@ -1903,7 +1905,7 @@ void background_job_unref (gpointer instance) { BACKGROUND_JOB_GET_CLASS (self)->finalize (self); #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1907 "BackgroundJob.c" +#line 1909 "BackgroundJob.c" } } diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c index 34c55e4..5a3b050 100644 --- a/src/threads/Semaphore.c +++ b/src/threads/Semaphore.c @@ -1,4 +1,4 @@ -/* Semaphore.c generated by valac 0.34.4, the Vala compiler +/* Semaphore.c generated by valac 0.34.7, the Vala compiler * generated from Semaphore.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -655,11 +655,11 @@ static void abstract_semaphore_class_init (AbstractSemaphoreClass * klass) { #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (AbstractSemaphorePrivate)); #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = abstract_semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_notify; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = abstract_semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_wait; #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_reset = abstract_semaphore_real_do_reset; + ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) abstract_semaphore_real_do_reset; #line 664 "Semaphore.c" } @@ -808,9 +808,9 @@ static void semaphore_class_init (SemaphoreClass * klass) { #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (SemaphorePrivate)); #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) semaphore_real_do_notify; #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) semaphore_real_do_wait; #line 815 "Semaphore.c" } @@ -960,9 +960,9 @@ static void countdown_semaphore_class_init (CountdownSemaphoreClass * klass) { #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (CountdownSemaphorePrivate)); #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = countdown_semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_notify; #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = countdown_semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_wait; #line 967 "Semaphore.c" } @@ -1080,11 +1080,11 @@ static void event_semaphore_class_init (EventSemaphoreClass * klass) { #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" g_type_class_add_private (klass, sizeof (EventSemaphorePrivate)); #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_notify = event_semaphore_real_do_notify; + ((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) event_semaphore_real_do_notify; #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_wait = event_semaphore_real_do_wait; + ((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) event_semaphore_real_do_wait; #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala" - ((AbstractSemaphoreClass *) klass)->do_reset = event_semaphore_real_do_reset; + ((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) event_semaphore_real_do_reset; #line 1089 "Semaphore.c" } diff --git a/src/threads/Threads.c b/src/threads/Threads.c index e50f83e..b2cace8 100644 --- a/src/threads/Threads.c +++ b/src/threads/Threads.c @@ -1,4 +1,4 @@ -/* Threads.c generated by valac 0.34.4, the Vala compiler +/* Threads.c generated by valac 0.34.7, the Vala compiler * generated from Threads.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/threads/Workers.c b/src/threads/Workers.c index 312f3e3..ff9d180 100644 --- a/src/threads/Workers.c +++ b/src/threads/Workers.c @@ -1,4 +1,4 @@ -/* Workers.c generated by valac 0.34.4, the Vala compiler +/* Workers.c generated by valac 0.34.7, the Vala compiler * generated from Workers.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -207,7 +207,7 @@ static gint64 _background_job_priority_comparator_comparator (void* a, void* b, BackgroundJobBatch* background_job_batch_construct (GType object_type) { BackgroundJobBatch * self = NULL; #line 10 "/home/jens/Source/shotwell/src/threads/Workers.vala" - self = (BackgroundJobBatch*) sorted_list_construct (object_type, TYPE_BACKGROUND_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, _background_job_priority_comparator_comparator, NULL); + self = (BackgroundJobBatch*) sorted_list_construct (object_type, TYPE_BACKGROUND_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, _background_job_priority_comparator_comparator, NULL); #line 9 "/home/jens/Source/shotwell/src/threads/Workers.vala" return self; #line 214 "Workers.c" @@ -663,29 +663,30 @@ gint workers_get_pending_job_count (Workers* self) { #line 664 "Workers.c" { GAsyncQueue* _tmp0_ = NULL; + gint _tmp4_ = 0; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp0_ = self->priv->queue; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_lock (&self->priv->__lock_queue); -#line 671 "Workers.c" +#line 672 "Workers.c" { gint _tmp1_ = 0; #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp1_ = self->priv->enqueued; #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala" result = _tmp1_; -#line 678 "Workers.c" +#line 679 "Workers.c" { GAsyncQueue* _tmp2_ = NULL; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp2_ = self->priv->queue; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_unlock (&self->priv->__lock_queue); -#line 685 "Workers.c" +#line 686 "Workers.c" } #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala" return result; -#line 689 "Workers.c" +#line 690 "Workers.c" } __finally11: { @@ -694,15 +695,15 @@ gint workers_get_pending_job_count (Workers* self) { _tmp3_ = self->priv->queue; #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_unlock (&self->priv->__lock_queue); -#line 698 "Workers.c" +#line 699 "Workers.c" } #line 79 "/home/jens/Source/shotwell/src/threads/Workers.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 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_clear_error (&_inner_error_); #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala" - return 0; -#line 706 "Workers.c" + return _tmp4_; +#line 707 "Workers.c" } } @@ -714,14 +715,14 @@ static void workers_thread_start (Workers* self, void* ignored) { GError * _inner_error_ = NULL; #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_return_if_fail (IS_WORKERS (self)); -#line 718 "Workers.c" +#line 719 "Workers.c" { GAsyncQueue* _tmp0_ = NULL; #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp0_ = self->priv->queue; #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_lock (&self->priv->__lock_queue); -#line 725 "Workers.c" +#line 726 "Workers.c" { GAsyncQueue* _tmp1_ = NULL; gpointer _tmp2_ = NULL; @@ -750,7 +751,7 @@ static void workers_thread_start (Workers* self, void* ignored) { _tmp5_ = self->priv->enqueued; #line 92 "/home/jens/Source/shotwell/src/threads/Workers.vala" empty = _tmp5_ == 0; -#line 754 "Workers.c" +#line 755 "Workers.c" } __finally12: { @@ -759,7 +760,7 @@ static void workers_thread_start (Workers* self, void* ignored) { _tmp6_ = self->priv->queue; #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_rec_mutex_unlock (&self->priv->__lock_queue); -#line 763 "Workers.c" +#line 764 "Workers.c" } #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -771,7 +772,7 @@ static void workers_thread_start (Workers* self, void* ignored) { g_clear_error (&_inner_error_); #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala" return; -#line 775 "Workers.c" +#line 776 "Workers.c" } } #line 95 "/home/jens/Source/shotwell/src/threads/Workers.vala" @@ -780,30 +781,30 @@ static void workers_thread_start (Workers* self, void* ignored) { if (!_tmp7_) { #line 96 "/home/jens/Source/shotwell/src/threads/Workers.vala" background_job_execute (job); -#line 784 "Workers.c" +#line 785 "Workers.c" } #line 98 "/home/jens/Source/shotwell/src/threads/Workers.vala" background_job_internal_notify_completion (job); #line 100 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (empty) { -#line 790 "Workers.c" +#line 791 "Workers.c" EventSemaphore* _tmp8_ = NULL; #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala" _tmp8_ = self->priv->empty_event; #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala" abstract_semaphore_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore)); -#line 796 "Workers.c" +#line 797 "Workers.c" } #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala" _background_job_unref0 (job); -#line 800 "Workers.c" +#line 801 "Workers.c" } static void value_workers_init (GValue* value) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 807 "Workers.c" +#line 808 "Workers.c" } @@ -812,7 +813,7 @@ static void value_workers_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_unref (value->data[0].v_pointer); -#line 816 "Workers.c" +#line 817 "Workers.c" } } @@ -822,11 +823,11 @@ static void value_workers_copy_value (const GValue* src_value, GValue* dest_valu if (src_value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" dest_value->data[0].v_pointer = workers_ref (src_value->data[0].v_pointer); -#line 826 "Workers.c" +#line 827 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" dest_value->data[0].v_pointer = NULL; -#line 830 "Workers.c" +#line 831 "Workers.c" } } @@ -834,37 +835,37 @@ static void value_workers_copy_value (const GValue* src_value, GValue* dest_valu static gpointer value_workers_peek_pointer (const GValue* value) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return value->data[0].v_pointer; -#line 838 "Workers.c" +#line 839 "Workers.c" } static gchar* value_workers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (collect_values[0].v_pointer) { -#line 845 "Workers.c" +#line 846 "Workers.c" Workers* object; object = collect_values[0].v_pointer; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (object->parent_instance.g_class == NULL) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 852 "Workers.c" +#line 853 "Workers.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 856 "Workers.c" +#line 857 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = workers_ref (object); -#line 860 "Workers.c" +#line 861 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 864 "Workers.c" +#line 865 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return NULL; -#line 868 "Workers.c" +#line 869 "Workers.c" } @@ -875,25 +876,25 @@ static gchar* value_workers_lcopy_value (const GValue* value, guint n_collect_va if (!object_p) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 879 "Workers.c" +#line 880 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (!value->data[0].v_pointer) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" *object_p = NULL; -#line 885 "Workers.c" +#line 886 "Workers.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" *object_p = value->data[0].v_pointer; -#line 889 "Workers.c" +#line 890 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" *object_p = workers_ref (value->data[0].v_pointer); -#line 893 "Workers.c" +#line 894 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return NULL; -#line 897 "Workers.c" +#line 898 "Workers.c" } @@ -907,7 +908,7 @@ GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return G_PARAM_SPEC (spec); -#line 911 "Workers.c" +#line 912 "Workers.c" } @@ -916,7 +917,7 @@ gpointer value_get_workers (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS), NULL); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return value->data[0].v_pointer; -#line 920 "Workers.c" +#line 921 "Workers.c" } @@ -936,17 +937,17 @@ void value_set_workers (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_ref (value->data[0].v_pointer); -#line 940 "Workers.c" +#line 941 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 944 "Workers.c" +#line 945 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (old) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_unref (old); -#line 950 "Workers.c" +#line 951 "Workers.c" } } @@ -965,17 +966,17 @@ void value_take_workers (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = v_object; -#line 969 "Workers.c" +#line 970 "Workers.c" } else { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" value->data[0].v_pointer = NULL; -#line 973 "Workers.c" +#line 974 "Workers.c" } #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" if (old) { #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" workers_unref (old); -#line 979 "Workers.c" +#line 980 "Workers.c" } } @@ -987,7 +988,7 @@ static void workers_class_init (WorkersClass * klass) { ((WorkersClass *) klass)->finalize = workers_finalize; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_type_class_add_private (klass, sizeof (WorkersPrivate)); -#line 991 "Workers.c" +#line 992 "Workers.c" } @@ -1010,7 +1011,7 @@ static void workers_instance_init (Workers * self) { self->priv->enqueued = 0; #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" self->ref_count = 1; -#line 1014 "Workers.c" +#line 1015 "Workers.c" } @@ -1028,7 +1029,7 @@ static void workers_finalize (Workers* obj) { _g_async_queue_unref0 (self->priv->queue); #line 20 "/home/jens/Source/shotwell/src/threads/Workers.vala" _abstract_semaphore_unref0 (self->priv->empty_event); -#line 1032 "Workers.c" +#line 1033 "Workers.c" } @@ -1053,7 +1054,7 @@ gpointer workers_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" return instance; -#line 1057 "Workers.c" +#line 1058 "Workers.c" } @@ -1066,7 +1067,7 @@ void workers_unref (gpointer instance) { WORKERS_GET_CLASS (self)->finalize (self); #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1070 "Workers.c" +#line 1071 "Workers.c" } } -- cgit v1.2.3