diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
| commit | 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch) | |
| tree | 496b2f3899e1d5728ee9ae76095cc5056c317447 /src/core/util.c | |
| parent | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff) | |
| parent | 5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff) | |
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'src/core/util.c')
| -rw-r--r-- | src/core/util.c | 1048 |
1 files changed, 650 insertions, 398 deletions
diff --git a/src/core/util.c b/src/core/util.c index f4143d3..2b9ace7 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.36.6, the Vala compiler +/* util.c generated by valac 0.40.4, the Vala compiler * generated from util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,6 +12,7 @@ /**/ /* This collection cannot be used to store null.*/ + #include <glib.h> #include <glib-object.h> #include <gee.h> @@ -32,6 +33,16 @@ typedef struct _SingletonCollection SingletonCollection; typedef struct _SingletonCollectionClass SingletonCollectionClass; typedef struct _SingletonCollectionPrivate SingletonCollectionPrivate; +enum { + SINGLETON_COLLECTION_0_PROPERTY, + SINGLETON_COLLECTION_G_TYPE, + SINGLETON_COLLECTION_G_DUP_FUNC, + SINGLETON_COLLECTION_G_DESTROY_FUNC, + SINGLETON_COLLECTION_READ_ONLY_PROPERTY, + SINGLETON_COLLECTION_SIZE_PROPERTY, + SINGLETON_COLLECTION_NUM_PROPERTIES +}; +static GParamSpec* singleton_collection_properties[SINGLETON_COLLECTION_NUM_PROPERTIES]; #define _g_destroy_func0(var) (((var == NULL) || (g_destroy_func == NULL)) ? NULL : (var = (g_destroy_func (var), NULL))) #define SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR (singleton_collection_singleton_iterator_get_type ()) @@ -44,6 +55,16 @@ typedef struct _SingletonCollectionPrivate SingletonCollectionPrivate; typedef struct _SingletonCollectionSingletonIterator SingletonCollectionSingletonIterator; typedef struct _SingletonCollectionSingletonIteratorClass SingletonCollectionSingletonIteratorClass; typedef struct _SingletonCollectionSingletonIteratorPrivate SingletonCollectionSingletonIteratorPrivate; +enum { + SINGLETON_COLLECTION_SINGLETON_ITERATOR_0_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, + SINGLETON_COLLECTION_SINGLETON_ITERATOR_NUM_PROPERTIES +}; +static GParamSpec* singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_MARKER (marker_get_type ()) @@ -191,93 +212,140 @@ static gpointer aggregate_progress_monitor_parent_class = NULL; GType singleton_collection_get_type (void) G_GNUC_CONST; #define SINGLETON_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SINGLETON_COLLECTION, SingletonCollectionPrivate)) -enum { - SINGLETON_COLLECTION_DUMMY_PROPERTY, - SINGLETON_COLLECTION_G_TYPE, - SINGLETON_COLLECTION_G_DUP_FUNC, - SINGLETON_COLLECTION_G_DESTROY_FUNC, - SINGLETON_COLLECTION_READ_ONLY_PROPERTY, - SINGLETON_COLLECTION_SIZE_PROPERTY -}; -SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); -SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object); -static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gconstpointer object); +SingletonCollection* singleton_collection_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); +SingletonCollection* singleton_collection_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object); +static gboolean singleton_collection_real_add (GeeAbstractCollection* base, + gconstpointer object); static void singleton_collection_real_clear (GeeAbstractCollection* base); -static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object); +static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, + gconstpointer object); static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base); -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c); -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c); +static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c); +static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c); static GType singleton_collection_singleton_iterator_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item); +static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, + gconstpointer item); #define SINGLETON_COLLECTION_SINGLETON_ITERATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIteratorPrivate)) -enum { - SINGLETON_COLLECTION_SINGLETON_ITERATOR_DUMMY_PROPERTY, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, - SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY -}; -static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target); +static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target); static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base); static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base); static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base); static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base); static void singleton_collection_singleton_iterator_finalize (GObject * obj); -static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); static void singleton_collection_finalize (GObject * obj); -static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void _vala_singleton_collection_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); +static void _vala_singleton_collection_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec); GType data_object_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; -void marker_mark (Marker* self, DataObject* object); -void marker_unmark (Marker* self, DataObject* object); -gboolean marker_toggle (Marker* self, DataObject* object); -void marker_mark_many (Marker* self, GeeCollection* list); -void marker_unmark_many (Marker* self, GeeCollection* list); +void marker_mark (Marker* self, + DataObject* object); +void marker_unmark (Marker* self, + DataObject* object); +gboolean marker_toggle (Marker* self, + DataObject* object); +void marker_mark_many (Marker* self, + GeeCollection* list); +void marker_unmark_many (Marker* self, + GeeCollection* list); void marker_mark_all (Marker* self); gint marker_get_count (Marker* self); GeeCollection* marker_get_all (Marker* self); gpointer unknown_total_monitor_ref (gpointer instance); void unknown_total_monitor_unref (gpointer instance); -GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_unknown_total_monitor (GValue* value, gpointer v_object); -void value_take_unknown_total_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_unknown_total_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_unknown_total_monitor (GValue* value, + gpointer v_object); +void value_take_unknown_total_monitor (GValue* value, + gpointer v_object); gpointer value_get_unknown_total_monitor (const GValue* value); GType unknown_total_monitor_get_type (void) G_GNUC_CONST; #define UNKNOWN_TOTAL_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitorPrivate)) -enum { - UNKNOWN_TOTAL_MONITOR_DUMMY_PROPERTY -}; -UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total); +UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, + guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, + guint64 count, + guint64 total); static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj); gpointer aggregate_progress_monitor_ref (gpointer instance); void aggregate_progress_monitor_unref (gpointer instance); -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object); -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object); +GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object); +void value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object); gpointer value_get_aggregate_progress_monitor (const GValue* value); GType aggregate_progress_monitor_get_type (void) G_GNUC_CONST; #define AGGREGATE_PROGRESS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitorPrivate)) -enum { - AGGREGATE_PROGRESS_MONITOR_DUMMY_PROPERTY -}; -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target); -void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name); -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total); +AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target); +void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, + const gchar* name); +gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total); static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj); -gboolean null_progress_monitor (guint64 count, guint64 total); +gboolean null_progress_monitor (guint64 count, + guint64 total); gdouble degrees_to_radians (gdouble theta); -SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object) { +SingletonCollection* +singleton_collection_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object) +{ SingletonCollection * self = NULL; - gconstpointer _tmp0_; - gpointer _tmp1_; + gpointer _tmp0_; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func); #line 65 "/home/jens/Source/shotwell/src/core/util.vala" @@ -287,27 +355,33 @@ SingletonCollection* singleton_collection_construct (GType object_type, GType g_ #line 65 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->g_destroy_func = g_destroy_func; #line 66 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = object; -#line 66 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = ((_tmp0_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp0_) : ((gpointer) _tmp0_); + _tmp0_ = ((object != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) object) : ((gpointer) object); #line 66 "/home/jens/Source/shotwell/src/core/util.vala" _g_destroy_func0 (self->priv->object); #line 66 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->object = _tmp1_; + self->priv->object = _tmp0_; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 300 "util.c" +#line 366 "util.c" } -SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object) { +SingletonCollection* +singleton_collection_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + gconstpointer object) +{ #line 65 "/home/jens/Source/shotwell/src/core/util.vala" return singleton_collection_construct (TYPE_SINGLETON_COLLECTION, g_type, g_dup_func, g_destroy_func, object); -#line 307 "util.c" +#line 378 "util.c" } -static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gconstpointer object) { +static gboolean +singleton_collection_real_add (GeeAbstractCollection* base, + gconstpointer object) +{ SingletonCollection * self; gboolean result = FALSE; #line 73 "/home/jens/Source/shotwell/src/core/util.vala" @@ -318,11 +392,13 @@ static gboolean singleton_collection_real_add (GeeAbstractCollection* base, gcon result = FALSE; #line 76 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 322 "util.c" +#line 396 "util.c" } -static void singleton_collection_real_clear (GeeAbstractCollection* base) { +static void +singleton_collection_real_clear (GeeAbstractCollection* base) +{ SingletonCollection * self; #line 79 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); @@ -330,30 +406,32 @@ static void singleton_collection_real_clear (GeeAbstractCollection* base) { ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 80 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->object = NULL; -#line 334 "util.c" +#line 410 "util.c" } -static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object) { +static gboolean +singleton_collection_real_contains (GeeAbstractCollection* base, + gconstpointer object) +{ SingletonCollection * self; gboolean result = FALSE; gconstpointer _tmp0_; - gconstpointer _tmp1_; #line 83 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 84 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = self->priv->object; #line 84 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = object; -#line 84 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp0_ == _tmp1_; + result = _tmp0_ == object; #line 84 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 353 "util.c" +#line 429 "util.c" } -static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base) { +static GeeIterator* +singleton_collection_real_iterator (GeeAbstractCollection* base) +{ SingletonCollection * self; GeeIterator* result = NULL; SingletonCollectionSingletonIterator* _tmp0_; @@ -365,23 +443,23 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERATOR, GeeIterator); #line 88 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 369 "util.c" +#line 447 "util.c" } -static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item) { +static gboolean +singleton_collection_real_remove (GeeAbstractCollection* base, + gconstpointer item) +{ SingletonCollection * self; gboolean result = FALSE; gconstpointer _tmp0_; - gconstpointer _tmp1_; #line 91 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 92 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = item; -#line 92 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->object; + _tmp0_ = self->priv->object; #line 92 "/home/jens/Source/shotwell/src/core/util.vala" - if (_tmp0_ == _tmp1_) { + if (item == _tmp0_) { #line 93 "/home/jens/Source/shotwell/src/core/util.vala" ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 93 "/home/jens/Source/shotwell/src/core/util.vala" @@ -390,17 +468,19 @@ static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, g result = TRUE; #line 95 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 394 "util.c" +#line 472 "util.c" } #line 98 "/home/jens/Source/shotwell/src/core/util.vala" result = FALSE; #line 98 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 400 "util.c" +#line 478 "util.c" } -static gboolean singleton_collection_real_get_read_only (GeeAbstractCollection* base) { +static gboolean +singleton_collection_real_get_read_only (GeeAbstractCollection* base) +{ gboolean result; SingletonCollection* self; #line 70 "/home/jens/Source/shotwell/src/core/util.vala" @@ -409,11 +489,13 @@ static gboolean singleton_collection_real_get_read_only (GeeAbstractCollection* result = FALSE; #line 70 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 413 "util.c" +#line 493 "util.c" } -static gint singleton_collection_real_get_size (GeeAbstractCollection* base) { +static gint +singleton_collection_real_get_size (GeeAbstractCollection* base) +{ gint result; SingletonCollection* self; gint _tmp0_ = 0; @@ -426,31 +508,38 @@ static gint singleton_collection_real_get_size (GeeAbstractCollection* base) { if (_tmp1_ != NULL) { #line 103 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = 1; -#line 430 "util.c" +#line 512 "util.c" } else { #line 103 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0_ = 0; -#line 434 "util.c" +#line 516 "util.c" } #line 103 "/home/jens/Source/shotwell/src/core/util.vala" result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 440 "util.c" +#line 522 "util.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 20 "/home/jens/Source/shotwell/src/core/util.vala" return self ? g_object_ref (self) : NULL; -#line 447 "util.c" +#line 531 "util.c" } -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) { +static SingletonCollectionSingletonIterator* +singleton_collection_singleton_iterator_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c) +{ SingletonCollectionSingletonIterator * self = NULL; SingletonCollection* _tmp0_; - SingletonCollection* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_SINGLETON_COLLECTION (c), NULL); #line 19 "/home/jens/Source/shotwell/src/core/util.vala" @@ -462,58 +551,58 @@ static SingletonCollectionSingletonIterator* singleton_collection_singleton_iter #line 19 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->g_destroy_func = g_destroy_func; #line 20 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = c; -#line 20 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (c); #line 20 "/home/jens/Source/shotwell/src/core/util.vala" _g_object_unref0 (self->priv->c); #line 20 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->c = _tmp1_; + self->priv->c = _tmp0_; #line 19 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 475 "util.c" +#line 562 "util.c" } -static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) { +static SingletonCollectionSingletonIterator* +singleton_collection_singleton_iterator_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + SingletonCollection* c) +{ #line 19 "/home/jens/Source/shotwell/src/core/util.vala" return singleton_collection_singleton_iterator_construct (SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, g_type, g_dup_func, g_destroy_func, c); -#line 482 "util.c" +#line 574 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) { +static gboolean +singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, + GeeForallFunc f, + void* f_target) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; - GeeForallFunc _tmp0_; - void* _tmp0__target; - SingletonCollection* _tmp1_; - gconstpointer _tmp2_; - gpointer _tmp3_; - gboolean _tmp4_; + SingletonCollection* _tmp0_; + gconstpointer _tmp1_; + gpointer _tmp2_; #line 31 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = f; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0__target = f_target; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->c; -#line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = _tmp1_->priv->object; + _tmp0_ = self->priv->c; #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = ((_tmp2_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp2_) : ((gpointer) _tmp2_); + _tmp1_ = _tmp0_->priv->object; #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = _tmp0_ (_tmp3_, _tmp0__target); + _tmp2_ = ((_tmp1_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp1_) : ((gpointer) _tmp1_); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp4_; + result = f (_tmp2_, f_target); #line 32 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 513 "util.c" +#line 600 "util.c" } -static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base) { +static gpointer +singleton_collection_singleton_iterator_real_get (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gpointer result = NULL; gconstpointer _tmp0_; @@ -528,11 +617,13 @@ static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* b result = _tmp1_; #line 36 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 532 "util.c" +#line 621 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_has_next (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; #line 39 "/home/jens/Source/shotwell/src/core/util.vala" @@ -541,11 +632,13 @@ static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterat result = FALSE; #line 40 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 545 "util.c" +#line 636 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_next (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean result = FALSE; gboolean _tmp0_; @@ -562,7 +655,7 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* result = FALSE; #line 45 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 566 "util.c" +#line 659 "util.c" } #line 47 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = TRUE; @@ -580,11 +673,13 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* result = TRUE; #line 50 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 584 "util.c" +#line 677 "util.c" } -static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base) { +static void +singleton_collection_singleton_iterator_real_remove (GeeIterator* base) +{ SingletonCollectionSingletonIterator * self; gboolean _tmp0_; #line 53 "/home/jens/Source/shotwell/src/core/util.vala" @@ -593,7 +688,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba _tmp0_ = self->priv->done; #line 54 "/home/jens/Source/shotwell/src/core/util.vala" if (!_tmp0_) { -#line 597 "util.c" +#line 692 "util.c" SingletonCollection* _tmp1_; #line 55 "/home/jens/Source/shotwell/src/core/util.vala" _tmp1_ = self->priv->c; @@ -605,15 +700,17 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba ((self->priv->current == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->current = (self->priv->g_destroy_func (self->priv->current), NULL)); #line 56 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->current = NULL; -#line 609 "util.c" +#line 704 "util.c" } #line 59 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = TRUE; -#line 613 "util.c" +#line 708 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) +{ gboolean result; SingletonCollectionSingletonIterator* self; gboolean _tmp0_; @@ -625,11 +722,13 @@ static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeI result = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 629 "util.c" +#line 726 "util.c" } -static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) { +static gboolean +singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) +{ gboolean result; SingletonCollectionSingletonIterator* self; gboolean _tmp0_; @@ -641,11 +740,13 @@ static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeItera result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 645 "util.c" +#line 744 "util.c" } -static void singleton_collection_singleton_iterator_class_init (SingletonCollectionSingletonIteratorClass * klass) { +static void +singleton_collection_singleton_iterator_class_init (SingletonCollectionSingletonIteratorClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -657,41 +758,49 @@ static void singleton_collection_singleton_iterator_class_init (SingletonCollect #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (klass)->finalize = singleton_collection_singleton_iterator_finalize; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 670 "util.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, singleton_collection_singleton_iterator_properties[SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY] = g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 771 "util.c" } -static GType singleton_collection_singleton_iterator_gee_traversable_get_g_type (SingletonCollectionSingletonIterator* self) { +static GType +singleton_collection_singleton_iterator_gee_traversable_get_g_type (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_type; -#line 677 "util.c" +#line 780 "util.c" } -static GBoxedCopyFunc singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func (SingletonCollectionSingletonIterator* self) { +static GBoxedCopyFunc +singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_dup_func; -#line 684 "util.c" +#line 789 "util.c" } -static GDestroyNotify singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func (SingletonCollectionSingletonIterator* self) { +static GDestroyNotify +singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func (SingletonCollectionSingletonIterator* self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" return self->priv->g_destroy_func; -#line 691 "util.c" +#line 798 "util.c" } -static void singleton_collection_singleton_iterator_gee_traversable_interface_init (GeeTraversableIface * iface) { +static void +singleton_collection_singleton_iterator_gee_traversable_interface_init (GeeTraversableIface * iface) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_gee_traversable_parent_iface = g_type_interface_peek_parent (iface); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -702,11 +811,13 @@ static void singleton_collection_singleton_iterator_gee_traversable_interface_in iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func; -#line 706 "util.c" +#line 815 "util.c" } -static void singleton_collection_singleton_iterator_gee_iterator_interface_init (GeeIteratorIface * iface) { +static void +singleton_collection_singleton_iterator_gee_iterator_interface_init (GeeIteratorIface * iface) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_singleton_iterator_gee_iterator_parent_iface = g_type_interface_peek_parent (iface); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -721,22 +832,26 @@ static void singleton_collection_singleton_iterator_gee_iterator_interface_init iface->get_read_only = singleton_collection_singleton_iterator_real_get_read_only; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" iface->get_valid = singleton_collection_singleton_iterator_real_get_valid; -#line 725 "util.c" +#line 836 "util.c" } -static void singleton_collection_singleton_iterator_instance_init (SingletonCollectionSingletonIterator * self) { +static void +singleton_collection_singleton_iterator_instance_init (SingletonCollectionSingletonIterator * self) +{ #line 14 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = SINGLETON_COLLECTION_SINGLETON_ITERATOR_GET_PRIVATE (self); #line 16 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->done = FALSE; #line 17 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->current = NULL; -#line 736 "util.c" +#line 849 "util.c" } -static void singleton_collection_singleton_iterator_finalize (GObject * obj) { +static void +singleton_collection_singleton_iterator_finalize (GObject * obj) +{ SingletonCollectionSingletonIterator * self; #line 14 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); @@ -746,11 +861,13 @@ static void singleton_collection_singleton_iterator_finalize (GObject * obj) { ((self->priv->current == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->current = (self->priv->g_destroy_func (self->priv->current), NULL)); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (singleton_collection_singleton_iterator_parent_class)->finalize (obj); -#line 750 "util.c" +#line 865 "util.c" } -static GType singleton_collection_singleton_iterator_get_type (void) { +static GType +singleton_collection_singleton_iterator_get_type (void) +{ static volatile gsize singleton_collection_singleton_iterator_type_id__volatile = 0; if (g_once_init_enter (&singleton_collection_singleton_iterator_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SingletonCollectionSingletonIteratorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) singleton_collection_singleton_iterator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SingletonCollectionSingletonIterator), 0, (GInstanceInitFunc) singleton_collection_singleton_iterator_instance_init, NULL }; @@ -766,7 +883,12 @@ static GType singleton_collection_singleton_iterator_get_type (void) { } -static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_singleton_iterator_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SingletonCollectionSingletonIterator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -783,18 +905,23 @@ static void _vala_singleton_collection_singleton_iterator_get_property (GObject g_value_set_boolean (value, gee_iterator_get_valid (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator))); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 787 "util.c" +#line 909 "util.c" default: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 793 "util.c" +#line 915 "util.c" } } -static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_singleton_iterator_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SingletonCollectionSingletonIterator * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" @@ -817,18 +944,20 @@ static void _vala_singleton_collection_singleton_iterator_set_property (GObject self->priv->g_destroy_func = g_value_get_pointer (value); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 821 "util.c" +#line 948 "util.c" default: #line 14 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 14 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 827 "util.c" +#line 954 "util.c" } } -static void singleton_collection_class_init (SingletonCollectionClass * klass) { +static void +singleton_collection_class_init (SingletonCollectionClass * klass) +{ #line 13 "/home/jens/Source/shotwell/src/core/util.vala" singleton_collection_parent_class = g_type_class_peek_parent (klass); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -854,27 +983,31 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) { #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (klass)->finalize = singleton_collection_finalize; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, singleton_collection_properties[SINGLETON_COLLECTION_READ_ONLY_PROPERTY] = g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 867 "util.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, singleton_collection_properties[SINGLETON_COLLECTION_SIZE_PROPERTY] = g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); +#line 996 "util.c" } -static void singleton_collection_instance_init (SingletonCollection * self) { +static void +singleton_collection_instance_init (SingletonCollection * self) +{ #line 13 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = SINGLETON_COLLECTION_GET_PRIVATE (self); -#line 874 "util.c" +#line 1005 "util.c" } -static void singleton_collection_finalize (GObject * obj) { +static void +singleton_collection_finalize (GObject * obj) +{ SingletonCollection * self; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLETON_COLLECTION, SingletonCollection); @@ -882,11 +1015,13 @@ static void singleton_collection_finalize (GObject * obj) { ((self->priv->object == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->priv->object = (self->priv->g_destroy_func (self->priv->object), NULL)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_CLASS (singleton_collection_parent_class)->finalize (obj); -#line 886 "util.c" +#line 1019 "util.c" } -GType singleton_collection_get_type (void) { +GType +singleton_collection_get_type (void) +{ static volatile gsize singleton_collection_type_id__volatile = 0; if (g_once_init_enter (&singleton_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SingletonCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) singleton_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SingletonCollection), 0, (GInstanceInitFunc) singleton_collection_instance_init, NULL }; @@ -898,7 +1033,12 @@ GType singleton_collection_get_type (void) { } -static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ SingletonCollection * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -915,18 +1055,23 @@ static void _vala_singleton_collection_get_property (GObject * object, guint pro g_value_set_int (value, gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection))); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 919 "util.c" +#line 1059 "util.c" default: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 925 "util.c" +#line 1065 "util.c" } } -static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_singleton_collection_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ SingletonCollection * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" @@ -949,102 +1094,127 @@ static void _vala_singleton_collection_set_property (GObject * object, guint pro self->priv->g_destroy_func = g_value_get_pointer (value); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 953 "util.c" +#line 1098 "util.c" default: #line 13 "/home/jens/Source/shotwell/src/core/util.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" break; -#line 959 "util.c" +#line 1104 "util.c" } } -void marker_mark (Marker* self, DataObject* object) { +void +marker_mark (Marker* self, + DataObject* object) +{ #line 113 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 113 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark (self, object); -#line 969 "util.c" +#line 1117 "util.c" } -void marker_unmark (Marker* self, DataObject* object) { +void +marker_unmark (Marker* self, + DataObject* object) +{ #line 115 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 115 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->unmark (self, object); -#line 978 "util.c" +#line 1129 "util.c" } -gboolean marker_toggle (Marker* self, DataObject* object) { +gboolean +marker_toggle (Marker* self, + DataObject* object) +{ #line 117 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), FALSE); #line 117 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->toggle (self, object); -#line 987 "util.c" +#line 1141 "util.c" } -void marker_mark_many (Marker* self, GeeCollection* list) { +void +marker_mark_many (Marker* self, + GeeCollection* list) +{ #line 119 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 119 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark_many (self, list); -#line 996 "util.c" +#line 1153 "util.c" } -void marker_unmark_many (Marker* self, GeeCollection* list) { +void +marker_unmark_many (Marker* self, + GeeCollection* list) +{ #line 121 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 121 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->unmark_many (self, list); -#line 1005 "util.c" +#line 1165 "util.c" } -void marker_mark_all (Marker* self) { +void +marker_mark_all (Marker* self) +{ #line 123 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_MARKER (self)); #line 123 "/home/jens/Source/shotwell/src/core/util.vala" MARKER_GET_INTERFACE (self)->mark_all (self); -#line 1014 "util.c" +#line 1176 "util.c" } -gint marker_get_count (Marker* self) { +gint +marker_get_count (Marker* self) +{ #line 127 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), 0); #line 127 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->get_count (self); -#line 1023 "util.c" +#line 1187 "util.c" } -GeeCollection* marker_get_all (Marker* self) { +GeeCollection* +marker_get_all (Marker* self) +{ #line 130 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_MARKER (self), NULL); #line 130 "/home/jens/Source/shotwell/src/core/util.vala" return MARKER_GET_INTERFACE (self)->get_all (self); -#line 1032 "util.c" +#line 1198 "util.c" } -static void marker_base_init (MarkerIface * iface) { +static void +marker_base_init (MarkerIface * iface) +{ #line 112 "/home/jens/Source/shotwell/src/core/util.vala" static gboolean initialized = FALSE; #line 112 "/home/jens/Source/shotwell/src/core/util.vala" if (!initialized) { #line 112 "/home/jens/Source/shotwell/src/core/util.vala" initialized = TRUE; -#line 1043 "util.c" +#line 1211 "util.c" } } -GType marker_get_type (void) { +GType +marker_get_type (void) +{ static volatile gsize marker_type_id__volatile = 0; if (g_once_init_enter (&marker_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MarkerIface), (GBaseInitFunc) marker_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -1057,45 +1227,47 @@ GType marker_get_type (void) { } -UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +UnknownTotalMonitor* +unknown_total_monitor_construct (GType object_type, + guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ UnknownTotalMonitor* self = NULL; - guint64 _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; #line 147 "/home/jens/Source/shotwell/src/core/util.vala" self = (UnknownTotalMonitor*) g_type_create_instance (object_type); #line 148 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = total; -#line 148 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->total = _tmp0_; + self->priv->total = total; #line 149 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = wrapped_monitor; + self->priv->wrapped_monitor = wrapped_monitor; #line 149 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1__target = wrapped_monitor_target; -#line 149 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor = _tmp1_; -#line 149 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor_target = _tmp1__target; + self->priv->wrapped_monitor_target = wrapped_monitor_target; #line 147 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 1082 "util.c" +#line 1248 "util.c" } -UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +UnknownTotalMonitor* +unknown_total_monitor_new (guint64 total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ #line 147 "/home/jens/Source/shotwell/src/core/util.vala" return unknown_total_monitor_construct (TYPE_UNKNOWN_TOTAL_MONITOR, total, wrapped_monitor, wrapped_monitor_target); -#line 1089 "util.c" +#line 1259 "util.c" } -gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total) { +gboolean +unknown_total_monitor_monitor (UnknownTotalMonitor* self, + guint64 count, + guint64 total) +{ gboolean result = FALSE; ProgressMonitor _tmp0_; void* _tmp0__target; guint64 _tmp1_; - guint64 _tmp2_; - gboolean _tmp3_; #line 152 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_UNKNOWN_TOTAL_MONITOR (self), FALSE); #line 153 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1103,117 +1275,138 @@ gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count #line 153 "/home/jens/Source/shotwell/src/core/util.vala" _tmp0__target = self->priv->wrapped_monitor_target; #line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = count; -#line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = self->priv->total; + _tmp1_ = self->priv->total; #line 153 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = _tmp0_ (_tmp1_, _tmp2_, TRUE, _tmp0__target); -#line 153 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp3_; + result = _tmp0_ (count, _tmp1_, TRUE, _tmp0__target); #line 153 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1116 "util.c" +#line 1284 "util.c" } -static void value_unknown_total_monitor_init (GValue* value) { +static void +value_unknown_total_monitor_init (GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1123 "util.c" +#line 1293 "util.c" } -static void value_unknown_total_monitor_free_value (GValue* value) { +static void +value_unknown_total_monitor_free_value (GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (value->data[0].v_pointer); -#line 1132 "util.c" +#line 1304 "util.c" } } -static void value_unknown_total_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_unknown_total_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (src_value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = unknown_total_monitor_ref (src_value->data[0].v_pointer); -#line 1142 "util.c" +#line 1317 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = NULL; -#line 1146 "util.c" +#line 1321 "util.c" } } -static gpointer value_unknown_total_monitor_peek_pointer (const GValue* value) { +static gpointer +value_unknown_total_monitor_peek_pointer (const GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1154 "util.c" +#line 1331 "util.c" } -static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_unknown_total_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { -#line 1161 "util.c" +#line 1343 "util.c" UnknownTotalMonitor * object; object = collect_values[0].v_pointer; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (object->parent_instance.g_class == NULL) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1168 "util.c" +#line 1350 "util.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 143 "/home/jens/Source/shotwell/src/core/util.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 1172 "util.c" +#line 1354 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = unknown_total_monitor_ref (object); -#line 1176 "util.c" +#line 1358 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1180 "util.c" +#line 1362 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1184 "util.c" +#line 1366 "util.c" } -static gchar* value_unknown_total_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_unknown_total_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ UnknownTotalMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1195 "util.c" +#line 1382 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (!value->data[0].v_pointer) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = NULL; -#line 1201 "util.c" +#line 1388 "util.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = value->data[0].v_pointer; -#line 1205 "util.c" +#line 1392 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = unknown_total_monitor_ref (value->data[0].v_pointer); -#line 1209 "util.c" +#line 1396 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1213 "util.c" +#line 1400 "util.c" } -GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_unknown_total_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecUnknownTotalMonitor* spec; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_UNKNOWN_TOTAL_MONITOR), NULL); @@ -1223,20 +1416,25 @@ GParamSpec* param_spec_unknown_total_monitor (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return G_PARAM_SPEC (spec); -#line 1227 "util.c" +#line 1420 "util.c" } -gpointer value_get_unknown_total_monitor (const GValue* value) { +gpointer +value_get_unknown_total_monitor (const GValue* value) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR), NULL); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1236 "util.c" +#line 1431 "util.c" } -void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { +void +value_set_unknown_total_monitor (GValue* value, + gpointer v_object) +{ UnknownTotalMonitor * old; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR)); @@ -1252,22 +1450,25 @@ void value_set_unknown_total_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_ref (value->data[0].v_pointer); -#line 1256 "util.c" +#line 1454 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1260 "util.c" +#line 1458 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (old); -#line 1266 "util.c" +#line 1464 "util.c" } } -void value_take_unknown_total_monitor (GValue* value, gpointer v_object) { +void +value_take_unknown_total_monitor (GValue* value, + gpointer v_object) +{ UnknownTotalMonitor * old; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR)); @@ -1281,52 +1482,60 @@ void value_take_unknown_total_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = v_object; -#line 1285 "util.c" +#line 1486 "util.c" } else { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1289 "util.c" +#line 1490 "util.c" } #line 143 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_unref (old); -#line 1295 "util.c" +#line 1496 "util.c" } } -static void unknown_total_monitor_class_init (UnknownTotalMonitorClass * klass) { +static void +unknown_total_monitor_class_init (UnknownTotalMonitorClass * klass) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" unknown_total_monitor_parent_class = g_type_class_peek_parent (klass); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" ((UnknownTotalMonitorClass *) klass)->finalize = unknown_total_monitor_finalize; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (UnknownTotalMonitorPrivate)); -#line 1307 "util.c" +#line 1510 "util.c" } -static void unknown_total_monitor_instance_init (UnknownTotalMonitor * self) { +static void +unknown_total_monitor_instance_init (UnknownTotalMonitor * self) +{ #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = UNKNOWN_TOTAL_MONITOR_GET_PRIVATE (self); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self->ref_count = 1; -#line 1316 "util.c" +#line 1521 "util.c" } -static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj) { +static void +unknown_total_monitor_finalize (UnknownTotalMonitor * obj) +{ UnknownTotalMonitor * self; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitor); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_signal_handlers_destroy (self); -#line 1326 "util.c" +#line 1533 "util.c" } -GType unknown_total_monitor_get_type (void) { +GType +unknown_total_monitor_get_type (void) +{ static volatile gsize unknown_total_monitor_type_id__volatile = 0; if (g_once_init_enter (&unknown_total_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_unknown_total_monitor_init, value_unknown_total_monitor_free_value, value_unknown_total_monitor_copy_value, value_unknown_total_monitor_peek_pointer, "p", value_unknown_total_monitor_collect_value, "p", value_unknown_total_monitor_lcopy_value }; @@ -1340,18 +1549,22 @@ GType unknown_total_monitor_get_type (void) { } -gpointer unknown_total_monitor_ref (gpointer instance) { +gpointer +unknown_total_monitor_ref (gpointer instance) +{ UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" return instance; -#line 1351 "util.c" +#line 1562 "util.c" } -void unknown_total_monitor_unref (gpointer instance) { +void +unknown_total_monitor_unref (gpointer instance) +{ UnknownTotalMonitor * self; self = instance; #line 143 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1360,256 +1573,273 @@ void unknown_total_monitor_unref (gpointer instance) { UNKNOWN_TOTAL_MONITOR_GET_CLASS (self)->finalize (self); #line 143 "/home/jens/Source/shotwell/src/core/util.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1364 "util.c" +#line 1577 "util.c" } } -AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +AggregateProgressMonitor* +aggregate_progress_monitor_construct (GType object_type, + guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ AggregateProgressMonitor* self = NULL; - guint64 _tmp0_; - ProgressMonitor _tmp1_; - void* _tmp1__target; #line 165 "/home/jens/Source/shotwell/src/core/util.vala" self = (AggregateProgressMonitor*) g_type_create_instance (object_type); #line 166 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = grand_total; -#line 166 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->grand_total = _tmp0_; -#line 167 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = wrapped_monitor; -#line 167 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1__target = wrapped_monitor_target; + self->priv->grand_total = grand_total; #line 167 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor = _tmp1_; + self->priv->wrapped_monitor = wrapped_monitor; #line 167 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->wrapped_monitor_target = _tmp1__target; + self->priv->wrapped_monitor_target = wrapped_monitor_target; #line 165 "/home/jens/Source/shotwell/src/core/util.vala" return self; -#line 1390 "util.c" +#line 1599 "util.c" } -AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) { +AggregateProgressMonitor* +aggregate_progress_monitor_new (guint64 grand_total, + ProgressMonitor wrapped_monitor, + void* wrapped_monitor_target) +{ #line 165 "/home/jens/Source/shotwell/src/core/util.vala" return aggregate_progress_monitor_construct (TYPE_AGGREGATE_PROGRESS_MONITOR, grand_total, wrapped_monitor, wrapped_monitor_target); -#line 1397 "util.c" +#line 1610 "util.c" } -void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name) { - const gchar* _tmp0_; - guint64 _tmp1_; +void +aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, + const gchar* name) +{ + guint64 _tmp0_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - guint64 _tmp4_; + guint64 _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; #line 170 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self)); #line 170 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (name != NULL); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = name; + _tmp0_ = self->priv->aggregate_count; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp1_ = self->priv->aggregate_count; + _tmp1_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp0_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp1_); + _tmp2_ = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = _tmp2_; + _tmp3_ = self->priv->grand_total; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = self->priv->grand_total; + _tmp4_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp3_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp5_ = g_strdup_printf ("%" G_GUINT64_FORMAT, _tmp4_); + _tmp5_ = _tmp4_; #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp6_ = _tmp5_; + g_debug ("util.vala:171: next step: %s (%s/%s)", name, _tmp2_, _tmp5_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - g_debug ("util.vala:171: next step: %s (%s/%s)", _tmp0_, _tmp3_, _tmp6_); + _g_free0 (_tmp5_); #line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _g_free0 (_tmp6_); -#line 171 "/home/jens/Source/shotwell/src/core/util.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 172 "/home/jens/Source/shotwell/src/core/util.vala" self->priv->last_count = G_MAXUINT64; -#line 1435 "util.c" +#line 1648 "util.c" } -gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total) { +gboolean +aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, + guint64 count, + guint64 total) +{ gboolean result = FALSE; guint64 _tmp0_ = 0ULL; guint64 _tmp1_; + guint64 _tmp3_; + guint64 _tmp4_; guint64 _tmp5_; - guint64 _tmp6_; - guint64 _tmp7_; + ProgressMonitor _tmp7_; + void* _tmp7__target; + guint64 _tmp8_; guint64 _tmp9_; - ProgressMonitor _tmp10_; - void* _tmp10__target; - guint64 _tmp11_; - guint64 _tmp12_; - gboolean _tmp13_; #line 175 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self), FALSE); #line 177 "/home/jens/Source/shotwell/src/core/util.vala" _tmp1_ = self->priv->last_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" if (_tmp1_ != G_MAXUINT64) { -#line 1458 "util.c" +#line 1673 "util.c" guint64 _tmp2_; - guint64 _tmp3_; -#line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp2_ = count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp3_ = self->priv->last_count; + _tmp2_ = self->priv->last_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = _tmp2_ - _tmp3_; -#line 1467 "util.c" + _tmp0_ = count - _tmp2_; +#line 1679 "util.c" } else { - guint64 _tmp4_; -#line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp4_ = count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = _tmp4_; -#line 1474 "util.c" + _tmp0_ = count; +#line 1683 "util.c" } #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp5_ = self->priv->aggregate_count; + _tmp3_ = self->priv->aggregate_count; #line 177 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->aggregate_count = _tmp5_ + _tmp0_; + self->priv->aggregate_count = _tmp3_ + _tmp0_; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp6_ = self->priv->aggregate_count; + _tmp4_ = self->priv->aggregate_count; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp7_ = self->priv->grand_total; + _tmp5_ = self->priv->grand_total; #line 178 "/home/jens/Source/shotwell/src/core/util.vala" - if (_tmp6_ > _tmp7_) { -#line 1486 "util.c" - guint64 _tmp8_; + if (_tmp4_ > _tmp5_) { +#line 1695 "util.c" + guint64 _tmp6_; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp8_ = self->priv->grand_total; + _tmp6_ = self->priv->grand_total; #line 179 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->aggregate_count = _tmp8_; -#line 1492 "util.c" + self->priv->aggregate_count = _tmp6_; +#line 1701 "util.c" } #line 182 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp9_ = count; -#line 182 "/home/jens/Source/shotwell/src/core/util.vala" - self->priv->last_count = _tmp9_; -#line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp10_ = self->priv->wrapped_monitor; + self->priv->last_count = count; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp10__target = self->priv->wrapped_monitor_target; + _tmp7_ = self->priv->wrapped_monitor; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp11_ = self->priv->aggregate_count; + _tmp7__target = self->priv->wrapped_monitor_target; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp12_ = self->priv->grand_total; + _tmp8_ = self->priv->aggregate_count; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp13_ = _tmp10_ (_tmp11_, _tmp12_, TRUE, _tmp10__target); + _tmp9_ = self->priv->grand_total; #line 184 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp13_; + result = _tmp7_ (_tmp8_, _tmp9_, TRUE, _tmp7__target); #line 184 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1512 "util.c" +#line 1717 "util.c" } -static void value_aggregate_progress_monitor_init (GValue* value) { +static void +value_aggregate_progress_monitor_init (GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1519 "util.c" +#line 1726 "util.c" } -static void value_aggregate_progress_monitor_free_value (GValue* value) { +static void +value_aggregate_progress_monitor_free_value (GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (value->data[0].v_pointer); -#line 1528 "util.c" +#line 1737 "util.c" } } -static void value_aggregate_progress_monitor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_aggregate_progress_monitor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (src_value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = aggregate_progress_monitor_ref (src_value->data[0].v_pointer); -#line 1538 "util.c" +#line 1750 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" dest_value->data[0].v_pointer = NULL; -#line 1542 "util.c" +#line 1754 "util.c" } } -static gpointer value_aggregate_progress_monitor_peek_pointer (const GValue* value) { +static gpointer +value_aggregate_progress_monitor_peek_pointer (const GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1550 "util.c" +#line 1764 "util.c" } -static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_aggregate_progress_monitor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (collect_values[0].v_pointer) { -#line 1557 "util.c" +#line 1776 "util.c" AggregateProgressMonitor * object; object = collect_values[0].v_pointer; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (object->parent_instance.g_class == NULL) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1564 "util.c" +#line 1783 "util.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 159 "/home/jens/Source/shotwell/src/core/util.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 1568 "util.c" +#line 1787 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = aggregate_progress_monitor_ref (object); -#line 1572 "util.c" +#line 1791 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1576 "util.c" +#line 1795 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1580 "util.c" +#line 1799 "util.c" } -static gchar* value_aggregate_progress_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_aggregate_progress_monitor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ AggregateProgressMonitor ** object_p; object_p = collect_values[0].v_pointer; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (!object_p) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1591 "util.c" +#line 1815 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (!value->data[0].v_pointer) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = NULL; -#line 1597 "util.c" +#line 1821 "util.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = value->data[0].v_pointer; -#line 1601 "util.c" +#line 1825 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" *object_p = aggregate_progress_monitor_ref (value->data[0].v_pointer); -#line 1605 "util.c" +#line 1829 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return NULL; -#line 1609 "util.c" +#line 1833 "util.c" } -GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_aggregate_progress_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecAggregateProgressMonitor* spec; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_AGGREGATE_PROGRESS_MONITOR), NULL); @@ -1619,20 +1849,25 @@ GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return G_PARAM_SPEC (spec); -#line 1623 "util.c" +#line 1853 "util.c" } -gpointer value_get_aggregate_progress_monitor (const GValue* value) { +gpointer +value_get_aggregate_progress_monitor (const GValue* value) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR), NULL); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return value->data[0].v_pointer; -#line 1632 "util.c" +#line 1864 "util.c" } -void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { +void +value_set_aggregate_progress_monitor (GValue* value, + gpointer v_object) +{ AggregateProgressMonitor * old; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR)); @@ -1648,22 +1883,25 @@ void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_ref (value->data[0].v_pointer); -#line 1652 "util.c" +#line 1887 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1656 "util.c" +#line 1891 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (old); -#line 1662 "util.c" +#line 1897 "util.c" } } -void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) { +void +value_take_aggregate_progress_monitor (GValue* value, + gpointer v_object) +{ AggregateProgressMonitor * old; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR)); @@ -1677,33 +1915,37 @@ void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = v_object; -#line 1681 "util.c" +#line 1919 "util.c" } else { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" value->data[0].v_pointer = NULL; -#line 1685 "util.c" +#line 1923 "util.c" } #line 159 "/home/jens/Source/shotwell/src/core/util.vala" if (old) { #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_unref (old); -#line 1691 "util.c" +#line 1929 "util.c" } } -static void aggregate_progress_monitor_class_init (AggregateProgressMonitorClass * klass) { +static void +aggregate_progress_monitor_class_init (AggregateProgressMonitorClass * klass) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" aggregate_progress_monitor_parent_class = g_type_class_peek_parent (klass); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" ((AggregateProgressMonitorClass *) klass)->finalize = aggregate_progress_monitor_finalize; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (AggregateProgressMonitorPrivate)); -#line 1703 "util.c" +#line 1943 "util.c" } -static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self) { +static void +aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self) +{ #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self->priv = AGGREGATE_PROGRESS_MONITOR_GET_PRIVATE (self); #line 162 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1712,21 +1954,25 @@ static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor * self->priv->last_count = G_MAXUINT64; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self->ref_count = 1; -#line 1716 "util.c" +#line 1958 "util.c" } -static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) { +static void +aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) +{ AggregateProgressMonitor * self; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitor); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_signal_handlers_destroy (self); -#line 1726 "util.c" +#line 1970 "util.c" } -GType aggregate_progress_monitor_get_type (void) { +GType +aggregate_progress_monitor_get_type (void) +{ static volatile gsize aggregate_progress_monitor_type_id__volatile = 0; if (g_once_init_enter (&aggregate_progress_monitor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_aggregate_progress_monitor_init, value_aggregate_progress_monitor_free_value, value_aggregate_progress_monitor_copy_value, value_aggregate_progress_monitor_peek_pointer, "p", value_aggregate_progress_monitor_collect_value, "p", value_aggregate_progress_monitor_lcopy_value }; @@ -1740,18 +1986,22 @@ GType aggregate_progress_monitor_get_type (void) { } -gpointer aggregate_progress_monitor_ref (gpointer instance) { +gpointer +aggregate_progress_monitor_ref (gpointer instance) +{ AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_atomic_int_inc (&self->ref_count); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" return instance; -#line 1751 "util.c" +#line 1999 "util.c" } -void aggregate_progress_monitor_unref (gpointer instance) { +void +aggregate_progress_monitor_unref (gpointer instance) +{ AggregateProgressMonitor * self; self = instance; #line 159 "/home/jens/Source/shotwell/src/core/util.vala" @@ -1760,31 +2010,33 @@ void aggregate_progress_monitor_unref (gpointer instance) { AGGREGATE_PROGRESS_MONITOR_GET_CLASS (self)->finalize (self); #line 159 "/home/jens/Source/shotwell/src/core/util.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1764 "util.c" +#line 2014 "util.c" } } -gboolean null_progress_monitor (guint64 count, guint64 total) { +gboolean +null_progress_monitor (guint64 count, + guint64 total) +{ gboolean result = FALSE; #line 190 "/home/jens/Source/shotwell/src/core/util.vala" result = TRUE; #line 190 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1775 "util.c" +#line 2028 "util.c" } -gdouble degrees_to_radians (gdouble theta) { +gdouble +degrees_to_radians (gdouble theta) +{ gdouble result = 0.0; - gdouble _tmp0_; -#line 195 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = theta; #line 195 "/home/jens/Source/shotwell/src/core/util.vala" - result = _tmp0_ * (G_PI / 180.0); + result = theta * (G_PI / 180.0); #line 195 "/home/jens/Source/shotwell/src/core/util.vala" return result; -#line 1788 "util.c" +#line 2040 "util.c" } |