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/library/ImportQueuePage.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/library/ImportQueuePage.c') diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index b64083a..a2794b7 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -1,4 +1,4 @@ -/* ImportQueuePage.c generated by valac 0.34.4, the Vala compiler +/* ImportQueuePage.c generated by valac 0.34.7, the Vala compiler * generated from ImportQueuePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -845,7 +845,7 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = self->priv->queue; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -874,7 +874,7 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -907,7 +907,7 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = self->priv->queue; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _tmp5_; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -944,7 +944,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -982,7 +982,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _batch_import_list; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = _tmp8_; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1317,7 +1317,7 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->queue; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1391,7 +1391,7 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = self->priv->queue; #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1481,11 +1481,11 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_type_class_add_private (klass, sizeof (ImportQueuePagePrivate)); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = import_queue_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) import_queue_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->add_actions = import_queue_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->remove_actions = import_queue_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) import_queue_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1503,11 +1503,11 @@ static void import_queue_page_instance_init (ImportQueuePage * self) { #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv = IMPORT_QUEUE_PAGE_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->queue = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = gee_hash_set_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_set_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 11 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->cancel_unallowed = _tmp1_; #line 12 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" -- cgit v1.2.3