diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
| commit | dfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch) | |
| tree | dee893916166ac1c8b479b74e7f341429945260e /src/core/util.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/core/util.c')
| -rw-r--r-- | src/core/util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/util.c b/src/core/util.c index e398d67..0ddab1f 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.34.4, the Vala compiler +/* util.c generated by valac 0.34.7, the Vala compiler * generated from util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -279,7 +279,7 @@ SingletonCollection* singleton_collection_construct (GType object_type, GType g_ gconstpointer _tmp0_ = NULL; gpointer _tmp1_ = NULL; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" - self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func); + 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" self->priv->g_type = g_type; #line 65 "/home/jens/Source/shotwell/src/core/util.vala" @@ -360,7 +360,7 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b #line 87 "/home/jens/Source/shotwell/src/core/util.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection); #line 88 "/home/jens/Source/shotwell/src/core/util.vala" - _tmp0_ = singleton_collection_singleton_iterator_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, self); + _tmp0_ = singleton_collection_singleton_iterator_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, self); #line 88 "/home/jens/Source/shotwell/src/core/util.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERATOR, GeeIterator); #line 88 "/home/jens/Source/shotwell/src/core/util.vala" @@ -834,15 +834,15 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) { #line 13 "/home/jens/Source/shotwell/src/core/util.vala" g_type_class_add_private (klass, sizeof (SingletonCollectionPrivate)); #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->add = singleton_collection_real_add; + ((GeeAbstractCollectionClass *) klass)->add = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_add; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->clear = singleton_collection_real_clear; + ((GeeAbstractCollectionClass *) klass)->clear = (void (*)(GeeAbstractCollection*)) singleton_collection_real_clear; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->contains = singleton_collection_real_contains; + ((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_contains; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->iterator = singleton_collection_real_iterator; + ((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*)(GeeAbstractCollection*)) singleton_collection_real_iterator; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" - ((GeeAbstractCollectionClass *) klass)->remove = singleton_collection_real_remove; + ((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_remove; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" GEE_ABSTRACT_COLLECTION_CLASS (klass)->get_read_only = singleton_collection_real_get_read_only; #line 13 "/home/jens/Source/shotwell/src/core/util.vala" |