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/Commands.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/Commands.c')
| -rw-r--r-- | src/Commands.c | 332 |
1 files changed, 166 insertions, 166 deletions
diff --git a/src/Commands.c b/src/Commands.c index e07a9de..bab2c06 100644 --- a/src/Commands.c +++ b/src/Commands.c @@ -1,4 +1,4 @@ -/* Commands.c generated by valac 0.34.4, the Vala compiler +/* Commands.c generated by valac 0.34.7, the Vala compiler * generated from Commands.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3201,7 +3201,7 @@ static void page_command_class_init (PageCommandClass * klass) { #line 9 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (PageCommandPrivate)); #line 9 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->prepare = page_command_real_prepare; + ((CommandClass *) klass)->prepare = (void (*)(Command*)) page_command_real_prepare; #line 9 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = page_command_finalize; #line 3208 "Commands.c" @@ -3706,13 +3706,13 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k #line 129 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (SimpleProxyableCommandPrivate)); #line 129 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = simple_proxyable_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) simple_proxyable_command_real_execute; #line 129 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->execute_on_source = simple_proxyable_command_real_execute_on_source; + ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) simple_proxyable_command_real_execute_on_source; #line 129 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = simple_proxyable_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) simple_proxyable_command_real_undo; #line 129 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->undo_on_source = simple_proxyable_command_real_undo_on_source; + ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) simple_proxyable_command_real_undo_on_source; #line 129 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = simple_proxyable_command_finalize; #line 3719 "Commands.c" @@ -3724,7 +3724,7 @@ static void simple_proxyable_command_instance_init (SimpleProxyableCommand * sel #line 129 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = SIMPLE_PROXYABLE_COMMAND_GET_PRIVATE (self); #line 131 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_set_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 131 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->proxies = _tmp0_; #line 3731 "Commands.c" @@ -3853,7 +3853,7 @@ static void single_photo_transformation_command_class_init (SinglePhotoTransform #line 183 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (SinglePhotoTransformationCommandPrivate)); #line 183 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = single_photo_transformation_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) single_photo_transformation_command_real_undo; #line 183 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = single_photo_transformation_command_finalize; #line 3860 "Commands.c" @@ -4160,17 +4160,17 @@ static void generic_photo_transformation_command_class_init (GenericPhotoTransfo #line 206 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (GenericPhotoTransformationCommandPrivate)); #line 206 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = generic_photo_transformation_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) generic_photo_transformation_command_real_execute; #line 206 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = generic_photo_transformation_command_real_execute_on_photo; + ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) generic_photo_transformation_command_real_execute_on_photo; #line 206 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = generic_photo_transformation_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) generic_photo_transformation_command_real_undo; #line 206 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->redo = generic_photo_transformation_command_real_redo; + ((CommandClass *) klass)->redo = (void (*)(Command*)) generic_photo_transformation_command_real_redo; #line 206 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->can_compress = generic_photo_transformation_command_real_can_compress; + ((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*)(GenericPhotoTransformationCommand*, Command*)) generic_photo_transformation_command_real_can_compress; #line 206 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->compress = generic_photo_transformation_command_real_compress; + ((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) generic_photo_transformation_command_real_compress; #line 206 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = generic_photo_transformation_command_finalize; #line 4177 "Commands.c" @@ -4463,7 +4463,7 @@ gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* s #line 318 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->source_list; #line 318 "/home/jens/Source/shotwell/src/Commands.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 318 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 318 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4559,7 +4559,7 @@ static void multiple_data_source_command_real_undo (Command* base) { #line 339 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->acted_upon; #line 339 "/home/jens/Source/shotwell/src/Commands.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 339 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 339 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4807,7 +4807,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* #line 371 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = todo; #line 371 "/home/jens/Source/shotwell/src/Commands.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 371 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = _tmp3_; #line 371 "/home/jens/Source/shotwell/src/Commands.vala" @@ -4930,7 +4930,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* #line 385 "/home/jens/Source/shotwell/src/Commands.vala" _tmp24_ = _source_list; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 385 "/home/jens/Source/shotwell/src/Commands.vala" _tmp26_ = _tmp25_; #line 385 "/home/jens/Source/shotwell/src/Commands.vala" @@ -5114,13 +5114,13 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl #line 275 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (MultipleDataSourceCommandPrivate)); #line 275 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = multiple_data_source_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) multiple_data_source_command_real_execute; #line 275 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = multiple_data_source_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_data_source_command_real_execute_on_source; #line 275 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = multiple_data_source_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) multiple_data_source_command_real_undo; #line 275 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = multiple_data_source_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_data_source_command_real_undo_on_source; #line 275 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = multiple_data_source_command_finalize; #line 5127 "Commands.c" @@ -5134,15 +5134,15 @@ static void multiple_data_source_command_instance_init (MultipleDataSourceComman #line 275 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = MULTIPLE_DATA_SOURCE_COMMAND_GET_PRIVATE (self); #line 278 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 278 "/home/jens/Source/shotwell/src/Commands.vala" self->source_list = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 282 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->acted_upon = _tmp1_; #line 283 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 283 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->hooked_collections = _tmp2_; #line 5149 "Commands.c" @@ -5754,13 +5754,13 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA #line 413 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (MultipleDataSourceAtOnceCommandPrivate)); #line 413 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = multiple_data_source_at_once_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) multiple_data_source_at_once_command_real_execute; #line 413 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = multiple_data_source_at_once_command_real_execute_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) multiple_data_source_at_once_command_real_execute_on_all; #line 413 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = multiple_data_source_at_once_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) multiple_data_source_at_once_command_real_undo; #line 413 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = multiple_data_source_at_once_command_real_undo_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all; #line 413 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = multiple_data_source_at_once_command_finalize; #line 5767 "Commands.c" @@ -5773,11 +5773,11 @@ static void multiple_data_source_at_once_command_instance_init (MultipleDataSour #line 413 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_PRIVATE (self); #line 414 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 414 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->sources = _tmp0_; #line 415 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 415 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->hooked_collections = _tmp1_; #line 5784 "Commands.c" @@ -5916,7 +5916,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr #line 497 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = _source_list; #line 497 "/home/jens/Source/shotwell/src/Commands.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 497 "/home/jens/Source/shotwell/src/Commands.vala" _tmp9_ = _tmp8_; #line 497 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6066,7 +6066,7 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans #line 489 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (MultiplePhotoTransformationCommandPrivate)); #line 489 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = multiple_photo_transformation_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_photo_transformation_command_real_undo_on_source; #line 489 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = multiple_photo_transformation_command_finalize; #line 6073 "Commands.c" @@ -6078,7 +6078,7 @@ static void multiple_photo_transformation_command_instance_init (MultiplePhotoTr #line 489 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self); #line 490 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 490 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->map = _tmp0_; #line 6085 "Commands.c" @@ -6101,7 +6101,7 @@ static void multiple_photo_transformation_command_finalize (GObject* obj) { #line 507 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->map; #line 507 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 507 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 507 "/home/jens/Source/shotwell/src/Commands.vala" @@ -6252,9 +6252,9 @@ static void rotate_single_command_class_init (RotateSingleCommandClass * klass) #line 525 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (RotateSingleCommandPrivate)); #line 525 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = rotate_single_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) rotate_single_command_real_execute; #line 525 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = rotate_single_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) rotate_single_command_real_undo; #line 525 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rotate_single_command_finalize; #line 6261 "Commands.c" @@ -6382,9 +6382,9 @@ static void rotate_multiple_command_class_init (RotateMultipleCommandClass * kla #line 543 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (RotateMultipleCommandPrivate)); #line 543 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = rotate_multiple_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) rotate_multiple_command_real_execute_on_source; #line 543 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = rotate_multiple_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) rotate_multiple_command_real_undo_on_source; #line 543 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rotate_multiple_command_finalize; #line 6391 "Commands.c" @@ -6513,9 +6513,9 @@ static void edit_title_command_class_init (EditTitleCommandClass * klass) { #line 562 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (EditTitleCommandPrivate)); #line 562 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = edit_title_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) edit_title_command_real_execute; #line 562 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = edit_title_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) edit_title_command_real_undo; #line 562 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_title_command_finalize; #line 6522 "Commands.c" @@ -6637,9 +6637,9 @@ static void edit_comment_command_class_init (EditCommentCommandClass * klass) { #line 584 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (EditCommentCommandPrivate)); #line 584 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = edit_comment_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) edit_comment_command_real_execute; #line 584 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = edit_comment_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) edit_comment_command_real_undo; #line 584 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_comment_command_finalize; #line 6646 "Commands.c" @@ -6924,9 +6924,9 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl #line 604 "/home/jens/Source/shotwell/src/Commands.vala" edit_multiple_titles_command_parent_class = g_type_class_peek_parent (klass); #line 604 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = edit_multiple_titles_command_real_execute_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_titles_command_real_execute_on_all; #line 604 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = edit_multiple_titles_command_real_undo_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all; #line 604 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_multiple_titles_command_finalize; #line 6933 "Commands.c" @@ -6936,7 +6936,7 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl static void edit_multiple_titles_command_instance_init (EditMultipleTitlesCommand * self) { GeeHashMap* _tmp0_ = NULL; #line 606 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 606 "/home/jens/Source/shotwell/src/Commands.vala" self->old_titles = _tmp0_; #line 6943 "Commands.c" @@ -7200,9 +7200,9 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma #line 629 "/home/jens/Source/shotwell/src/Commands.vala" edit_multiple_comments_command_parent_class = g_type_class_peek_parent (klass); #line 629 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = edit_multiple_comments_command_real_execute_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_comments_command_real_execute_on_all; #line 629 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = edit_multiple_comments_command_real_undo_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all; #line 629 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_multiple_comments_command_finalize; #line 7209 "Commands.c" @@ -7212,7 +7212,7 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma static void edit_multiple_comments_command_instance_init (EditMultipleCommentsCommand * self) { GeeHashMap* _tmp0_ = NULL; #line 631 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 631 "/home/jens/Source/shotwell/src/Commands.vala" self->old_comments = _tmp0_; #line 7219 "Commands.c" @@ -7331,9 +7331,9 @@ static void rename_event_command_class_init (RenameEventCommandClass * klass) { #line 652 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (RenameEventCommandPrivate)); #line 652 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->execute_on_source = rename_event_command_real_execute_on_source; + ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_event_command_real_execute_on_source; #line 652 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->undo_on_source = rename_event_command_real_undo_on_source; + ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_event_command_real_undo_on_source; #line 652 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rename_event_command_finalize; #line 7340 "Commands.c" @@ -7459,9 +7459,9 @@ static void edit_event_comment_command_class_init (EditEventCommentCommandClass #line 672 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (EditEventCommentCommandPrivate)); #line 672 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->execute_on_source = edit_event_comment_command_real_execute_on_source; + ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) edit_event_comment_command_real_execute_on_source; #line 672 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->undo_on_source = edit_event_comment_command_real_undo_on_source; + ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) edit_event_comment_command_real_undo_on_source; #line 672 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = edit_event_comment_command_finalize; #line 7468 "Commands.c" @@ -7583,9 +7583,9 @@ static void set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) { #line 692 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (SetKeyPhotoCommandPrivate)); #line 692 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = set_key_photo_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) set_key_photo_command_real_execute; #line 692 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = set_key_photo_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) set_key_photo_command_real_undo; #line 692 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_key_photo_command_finalize; #line 7592 "Commands.c" @@ -7724,9 +7724,9 @@ static void revert_single_command_class_init (RevertSingleCommandClass * klass) #line 712 "/home/jens/Source/shotwell/src/Commands.vala" revert_single_command_parent_class = g_type_class_peek_parent (klass); #line 712 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = revert_single_command_real_execute_on_photo; + ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) revert_single_command_real_execute_on_photo; #line 712 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->compress = revert_single_command_real_compress; + ((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) revert_single_command_real_compress; #line 7731 "Commands.c" } @@ -7794,7 +7794,7 @@ static void revert_multiple_command_class_init (RevertMultipleCommandClass * kla #line 735 "/home/jens/Source/shotwell/src/Commands.vala" revert_multiple_command_parent_class = g_type_class_peek_parent (klass); #line 735 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = revert_multiple_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) revert_multiple_command_real_execute_on_source; #line 7799 "Commands.c" } @@ -7934,9 +7934,9 @@ static void enhance_single_command_class_init (EnhanceSingleCommandClass * klass #line 746 "/home/jens/Source/shotwell/src/Commands.vala" enhance_single_command_parent_class = g_type_class_peek_parent (klass); #line 746 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = enhance_single_command_real_execute_on_photo; + ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) enhance_single_command_real_execute_on_photo; #line 746 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->compress = enhance_single_command_real_compress; + ((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) enhance_single_command_real_compress; #line 7941 "Commands.c" } @@ -8004,7 +8004,7 @@ static void enhance_multiple_command_class_init (EnhanceMultipleCommandClass * k #line 779 "/home/jens/Source/shotwell/src/Commands.vala" enhance_multiple_command_parent_class = g_type_class_peek_parent (klass); #line 779 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = enhance_multiple_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) enhance_multiple_command_real_execute_on_source; #line 8009 "Commands.c" } @@ -8138,7 +8138,7 @@ static void straighten_command_class_init (StraightenCommandClass * klass) { #line 790 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (StraightenCommandPrivate)); #line 790 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = straighten_command_real_execute_on_photo; + ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) straighten_command_real_execute_on_photo; #line 790 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = straighten_command_finalize; #line 8145 "Commands.c" @@ -8237,7 +8237,7 @@ static void crop_command_class_init (CropCommandClass * klass) { #line 815 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (CropCommandPrivate)); #line 815 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = crop_command_real_execute_on_photo; + ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) crop_command_real_execute_on_photo; #line 815 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = crop_command_finalize; #line 8244 "Commands.c" @@ -8386,9 +8386,9 @@ static void adjust_colors_single_command_class_init (AdjustColorsSingleCommandCl #line 829 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (AdjustColorsSingleCommandPrivate)); #line 829 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = adjust_colors_single_command_real_execute_on_photo; + ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) adjust_colors_single_command_real_execute_on_photo; #line 829 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->can_compress = adjust_colors_single_command_real_can_compress; + ((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*)(GenericPhotoTransformationCommand*, Command*)) adjust_colors_single_command_real_can_compress; #line 829 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_colors_single_command_finalize; #line 8395 "Commands.c" @@ -8500,7 +8500,7 @@ static void adjust_colors_multiple_command_class_init (AdjustColorsMultipleComma #line 852 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (AdjustColorsMultipleCommandPrivate)); #line 852 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = adjust_colors_multiple_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_colors_multiple_command_real_execute_on_source; #line 852 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_colors_multiple_command_finalize; #line 8507 "Commands.c" @@ -8601,7 +8601,7 @@ static void redeye_command_class_init (RedeyeCommandClass * klass) { #line 868 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (RedeyeCommandPrivate)); #line 868 "/home/jens/Source/shotwell/src/Commands.vala" - ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = redeye_command_real_execute_on_photo; + ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) redeye_command_real_execute_on_photo; #line 868 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = redeye_command_finalize; #line 8608 "Commands.c" @@ -8778,7 +8778,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com #line 896 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = _source_list; #line 896 "/home/jens/Source/shotwell/src/Commands.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 896 "/home/jens/Source/shotwell/src/Commands.vala" _tmp9_ = _tmp8_; #line 896 "/home/jens/Source/shotwell/src/Commands.vala" @@ -8994,7 +8994,7 @@ static void move_photos_command_real_move_photos_command_real_execute (Command* #line 928 "/home/jens/Source/shotwell/src/Commands.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list; #line 928 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 928 "/home/jens/Source/shotwell/src/Commands.vala" _tmp15_ = _tmp14_; #line 928 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9193,11 +9193,11 @@ static void move_photos_command_real_move_photos_command_class_init (MovePhotosC #line 886 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (MovePhotosCommandRealMovePhotosCommandPrivate)); #line 886 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = move_photos_command_real_move_photos_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) move_photos_command_real_move_photos_command_real_execute; #line 886 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = move_photos_command_real_move_photos_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) move_photos_command_real_move_photos_command_real_execute_on_source; #line 886 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = move_photos_command_real_move_photos_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source; #line 886 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = move_photos_command_real_move_photos_command_finalize; #line 9204 "Commands.c" @@ -9211,7 +9211,7 @@ static void move_photos_command_real_move_photos_command_instance_init (MovePhot #line 887 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->new_event_proxy = NULL; #line 888 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 888 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->old_events = _tmp0_; #line 9218 "Commands.c" @@ -9242,7 +9242,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj) #line 916 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = self->priv->old_events; #line 916 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap)); + _tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 916 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = _tmp3_; #line 916 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9329,11 +9329,11 @@ static void move_photos_command_class_init (MovePhotosCommandClass * klass) { #line 883 "/home/jens/Source/shotwell/src/Commands.vala" move_photos_command_parent_class = g_type_class_peek_parent (klass); #line 883 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->prepare = move_photos_command_real_prepare; + ((CommandClass *) klass)->prepare = (void (*)(Command*)) move_photos_command_real_prepare; #line 883 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = move_photos_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) move_photos_command_real_execute; #line 883 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = move_photos_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) move_photos_command_real_undo; #line 883 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = move_photos_command_finalize; #line 9340 "Commands.c" @@ -9615,7 +9615,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab #line 1033 "/home/jens/Source/shotwell/src/Commands.vala" unnamed_evt_src_count = 0; #line 1034 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1034 "/home/jens/Source/shotwell/src/Commands.vala" media_thumbs = _tmp0_; #line 9622 "Commands.c" @@ -9875,7 +9875,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" _tmp49_ = media_thumbs; #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" _tmp51_ = _tmp50_; #line 1073 "/home/jens/Source/shotwell/src/Commands.vala" @@ -9989,7 +9989,7 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->dupes; #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 1097 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10251,13 +10251,13 @@ static void duplicate_multiple_photos_command_class_init (DuplicateMultiplePhoto #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (DuplicateMultiplePhotosCommandPrivate)); #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = duplicate_multiple_photos_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) duplicate_multiple_photos_command_real_execute; #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = duplicate_multiple_photos_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) duplicate_multiple_photos_command_real_execute_on_source; #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = duplicate_multiple_photos_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) duplicate_multiple_photos_command_real_undo; #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = duplicate_multiple_photos_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source; #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = duplicate_multiple_photos_command_finalize; #line 10264 "Commands.c" @@ -10269,7 +10269,7 @@ static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePh #line 1080 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = DUPLICATE_MULTIPLE_PHOTOS_COMMAND_GET_PRIVATE (self); #line 1081 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1081 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->dupes = _tmp0_; #line 1082 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10470,9 +10470,9 @@ static void set_rating_single_command_class_init (SetRatingSingleCommandClass * #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (SetRatingSingleCommandPrivate)); #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = set_rating_single_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) set_rating_single_command_real_execute; #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = set_rating_single_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) set_rating_single_command_real_undo; #line 1148 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_rating_single_command_finalize; #line 10479 "Commands.c" @@ -10659,7 +10659,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt #line 1215 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_ITERABLE (iter)); #line 1216 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_RATING, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_RATING, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1216 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->last_rating_map); #line 1216 "/home/jens/Source/shotwell/src/Commands.vala" @@ -10835,13 +10835,13 @@ static void set_rating_command_class_init (SetRatingCommandClass * klass) { #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (SetRatingCommandPrivate)); #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = set_rating_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) set_rating_command_real_execute; #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = set_rating_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) set_rating_command_real_undo; #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = set_rating_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_rating_command_real_execute_on_source; #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = set_rating_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_rating_command_real_undo_on_source; #line 1187 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_rating_command_finalize; #line 10848 "Commands.c" @@ -10930,13 +10930,13 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand #line 1262 "/home/jens/Source/shotwell/src/Commands.vala" g_return_if_fail (GEE_IS_ITERABLE (iter)); #line 1263 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_RAW_DEVELOPER, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_RAW_DEVELOPER, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1263 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->last_developer_map); #line 1263 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->last_developer_map = _tmp0_; #line 1264 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1264 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->last_transformation_map); #line 1264 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11249,13 +11249,13 @@ static void set_raw_developer_command_class_init (SetRawDeveloperCommandClass * #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (SetRawDeveloperCommandPrivate)); #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = set_raw_developer_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) set_raw_developer_command_real_execute; #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = set_raw_developer_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) set_raw_developer_command_real_undo; #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = set_raw_developer_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_raw_developer_command_real_execute_on_source; #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = set_raw_developer_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_raw_developer_command_real_undo_on_source; #line 1250 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = set_raw_developer_command_finalize; #line 11262 "Commands.c" @@ -11594,9 +11594,9 @@ static void adjust_date_time_photo_command_class_init (AdjustDateTimePhotoComman #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (AdjustDateTimePhotoCommandPrivate)); #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = adjust_date_time_photo_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) adjust_date_time_photo_command_real_execute; #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = adjust_date_time_photo_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) adjust_date_time_photo_command_real_undo; #line 1306 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photo_command_finalize; #line 11603 "Commands.c" @@ -11688,7 +11688,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob #line 1373 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->modify_originals = _tmp5_; #line 1377 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp6_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1377 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->prev_events); #line 1377 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11829,7 +11829,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob #line 11830 "Commands.c" } #line 1390 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp32_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp32_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1390 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->old_times); #line 1390 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11858,7 +11858,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) { #line 1393 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand); #line 1394 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1394 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->error_list); #line 1394 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11868,7 +11868,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) { #line 1397 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->error_list; #line 1397 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1397 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp2_; #line 1397 "/home/jens/Source/shotwell/src/Commands.vala" @@ -11885,7 +11885,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) { #line 1398 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = self->priv->error_list; #line 1398 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1398 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = _tmp6_; #line 1398 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12069,7 +12069,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) { #line 1417 "/home/jens/Source/shotwell/src/Commands.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand); #line 1418 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1418 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->error_list); #line 1418 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12079,7 +12079,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) { #line 1421 "/home/jens/Source/shotwell/src/Commands.vala" _tmp1_ = self->priv->error_list; #line 1421 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1421 "/home/jens/Source/shotwell/src/Commands.vala" _tmp3_ = _tmp2_; #line 1421 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12096,7 +12096,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) { #line 1422 "/home/jens/Source/shotwell/src/Commands.vala" _tmp5_ = self->priv->error_list; #line 1422 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1422 "/home/jens/Source/shotwell/src/Commands.vala" _tmp7_ = _tmp6_; #line 1422 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12490,13 +12490,13 @@ static void adjust_date_time_photos_command_class_init (AdjustDateTimePhotosComm #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (AdjustDateTimePhotosCommandPrivate)); #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = adjust_date_time_photos_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) adjust_date_time_photos_command_real_execute; #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = adjust_date_time_photos_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) adjust_date_time_photos_command_real_undo; #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->execute_on_source = adjust_date_time_photos_command_real_execute_on_source; + ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_date_time_photos_command_real_execute_on_source; #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceCommandClass *) klass)->undo_on_source = adjust_date_time_photos_command_real_undo_on_source; + ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_date_time_photos_command_real_undo_on_source; #line 1355 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photos_command_finalize; #line 12503 "Commands.c" @@ -12704,7 +12704,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in #line 1498 "/home/jens/Source/shotwell/src/Commands.vala" tag_proxy = _tmp23_; #line 1502 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1502 "/home/jens/Source/shotwell/src/Commands.vala" add_sources = _tmp24_; #line 12711 "Commands.c" @@ -12775,7 +12775,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" _tmp36_ = add_sources; #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" _tmp38_ = _tmp37_; #line 1508 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12858,7 +12858,7 @@ static void add_tags_command_real_execute (Command* base) { #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->map; #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 1528 "/home/jens/Source/shotwell/src/Commands.vala" @@ -12949,7 +12949,7 @@ static void add_tags_command_real_undo (Command* base) { #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->map; #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 1533 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13050,7 +13050,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->map; #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 1541 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13151,9 +13151,9 @@ static void add_tags_command_class_init (AddTagsCommandClass * klass) { #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (AddTagsCommandPrivate)); #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = add_tags_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) add_tags_command_real_execute; #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = add_tags_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) add_tags_command_real_undo; #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = add_tags_command_finalize; #line 13160 "Commands.c" @@ -13165,7 +13165,7 @@ static void add_tags_command_instance_init (AddTagsCommand * self) { #line 1481 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = ADD_TAGS_COMMAND_GET_PRIVATE (self); #line 1482 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_map_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1482 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->map = _tmp0_; #line 13172 "Commands.c" @@ -13192,7 +13192,7 @@ static void add_tags_command_finalize (GObject* obj) { #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" _tmp0_ = self->priv->map; #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _tmp1_; #line 1520 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13432,9 +13432,9 @@ static void rename_tag_command_class_init (RenameTagCommandClass * klass) { #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (RenameTagCommandPrivate)); #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->execute_on_source = rename_tag_command_real_execute_on_source; + ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_tag_command_real_execute_on_source; #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->undo_on_source = rename_tag_command_real_undo_on_source; + ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_tag_command_real_undo_on_source; #line 1555 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rename_tag_command_finalize; #line 13441 "Commands.c" @@ -13576,7 +13576,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b #line 13577 "Commands.c" GeeArrayList* _tmp7_ = NULL; #line 1594 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL); + _tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 1594 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->recursive_victim_proxies); #line 1594 "/home/jens/Source/shotwell/src/Commands.vala" @@ -13846,9 +13846,9 @@ static void delete_tag_command_class_init (DeleteTagCommandClass * klass) { #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (DeleteTagCommandPrivate)); #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->execute_on_source = delete_tag_command_real_execute_on_source; + ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) delete_tag_command_real_execute_on_source; #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->undo_on_source = delete_tag_command_real_undo_on_source; + ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) delete_tag_command_real_undo_on_source; #line 1579 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = delete_tag_command_finalize; #line 13855 "Commands.c" @@ -14010,9 +14010,9 @@ static void new_child_tag_command_class_init (NewChildTagCommandClass * klass) { #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (NewChildTagCommandPrivate)); #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->execute_on_source = new_child_tag_command_real_execute_on_source; + ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) new_child_tag_command_real_execute_on_source; #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->undo_on_source = new_child_tag_command_real_undo_on_source; + ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) new_child_tag_command_real_undo_on_source; #line 1633 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = new_child_tag_command_finalize; #line 14019 "Commands.c" @@ -14174,9 +14174,9 @@ static void new_root_tag_command_class_init (NewRootTagCommandClass * klass) { #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (NewRootTagCommandPrivate)); #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = new_root_tag_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) new_root_tag_command_real_execute; #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = new_root_tag_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) new_root_tag_command_real_undo; #line 1656 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = new_root_tag_command_finalize; #line 14183 "Commands.c" @@ -14745,7 +14745,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* #line 1737 "/home/jens/Source/shotwell/src/Commands.vala" path = _tmp6_; #line 1739 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1739 "/home/jens/Source/shotwell/src/Commands.vala" _result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap); #line 1742 "/home/jens/Source/shotwell/src/Commands.vala" @@ -14881,7 +14881,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" _tmp36_ = child_subpath; #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp37_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp37_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" _tmp38_ = _tmp37_; #line 1751 "/home/jens/Source/shotwell/src/Commands.vala" @@ -15401,13 +15401,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) { #line 1796 "/home/jens/Source/shotwell/src/Commands.vala" _vala_assert (_tmp1_ == NULL, "dest_before_state == null"); #line 1798 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp2_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 1798 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->src_before_state); #line 1798 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->src_before_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); #line 1799 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 1799 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->dest_before_state); #line 1799 "/home/jens/Source/shotwell/src/Commands.vala" @@ -15541,7 +15541,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) { #line 1823 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->existing_dest_child_structure = _tmp34_; #line 1824 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp35_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp35_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1824 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->existing_dest_membership); #line 1824 "/home/jens/Source/shotwell/src/Commands.vala" @@ -16383,7 +16383,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) GeeCollection* _tmp50_ = NULL; GeeCollection* _tmp51_ = NULL; #line 1882 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp47_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp47_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1882 "/home/jens/Source/shotwell/src/Commands.vala" starting_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_SET, GeeSet); #line 1883 "/home/jens/Source/shotwell/src/Commands.vala" @@ -17017,7 +17017,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) { #line 1923 "/home/jens/Source/shotwell/src/Commands.vala" _vala_assert (_tmp0_ == NULL, "after_state == null"); #line 1925 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 1925 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->after_state); #line 1925 "/home/jens/Source/shotwell/src/Commands.vala" @@ -17402,7 +17402,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman #line 17403 "Commands.c" GeeHashMap* _tmp6_ = NULL; #line 1970 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1970 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->src_parent_detachments); #line 1970 "/home/jens/Source/shotwell/src/Commands.vala" @@ -17527,7 +17527,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" _tmp28_ = current_parent_path; #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp29_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp29_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" _tmp30_ = _tmp29_; #line 1977 "/home/jens/Source/shotwell/src/Commands.vala" @@ -18216,7 +18216,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g #line 2029 "/home/jens/Source/shotwell/src/Commands.vala" to_tag = _tmp6_; #line 2033 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 2033 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->dest_parent_attachments); #line 2033 "/home/jens/Source/shotwell/src/Commands.vala" @@ -18323,7 +18323,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" _tmp26_ = current_parent_path; #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp27_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp27_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" _tmp28_ = _tmp27_; #line 2039 "/home/jens/Source/shotwell/src/Commands.vala" @@ -18979,9 +18979,9 @@ static void reparent_tag_command_class_init (ReparentTagCommandClass * klass) { #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (ReparentTagCommandPrivate)); #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = reparent_tag_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) reparent_tag_command_real_execute; #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = reparent_tag_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) reparent_tag_command_real_undo; #line 1679 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = reparent_tag_command_finalize; #line 18988 "Commands.c" @@ -18999,7 +18999,7 @@ static void reparent_tag_command_instance_init (ReparentTagCommand * self) { #line 1685 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->after_state = NULL; #line 1686 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1686 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->sources_in_play = _tmp0_; #line 1687 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19219,7 +19219,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource } } #line 2160 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 2160 "/home/jens/Source/shotwell/src/Commands.vala" new_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 19226 "Commands.c" @@ -19428,7 +19428,7 @@ static void modify_tags_command_real_execute (Command* base) { #line 2186 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _proxy_list; #line 2186 "/home/jens/Source/shotwell/src/Commands.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 2186 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = _tmp3_; #line 2186 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19515,7 +19515,7 @@ static void modify_tags_command_real_execute (Command* base) { #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" _tmp19_ = _proxy_list; #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" _tmp21_ = _tmp20_; #line 2189 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19604,7 +19604,7 @@ static void modify_tags_command_real_undo (Command* base) { #line 2194 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _proxy_list; #line 2194 "/home/jens/Source/shotwell/src/Commands.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 2194 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = _tmp3_; #line 2194 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19691,7 +19691,7 @@ static void modify_tags_command_real_undo (Command* base) { #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" _tmp19_ = _proxy_list; #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" _tmp21_ = _tmp20_; #line 2197 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19780,9 +19780,9 @@ static void modify_tags_command_class_init (ModifyTagsCommandClass * klass) { #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (ModifyTagsCommandPrivate)); #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = modify_tags_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) modify_tags_command_real_execute; #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = modify_tags_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) modify_tags_command_real_undo; #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = modify_tags_command_finalize; #line 19789 "Commands.c" @@ -19795,11 +19795,11 @@ static void modify_tags_command_instance_init (ModifyTagsCommand * self) { #line 2138 "/home/jens/Source/shotwell/src/Commands.vala" self->priv = MODIFY_TAGS_COMMAND_GET_PRIVATE (self); #line 2140 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp0_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 2140 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->to_add = _tmp0_; #line 2141 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL); #line 2141 "/home/jens/Source/shotwell/src/Commands.vala" self->priv->to_remove = _tmp1_; #line 19806 "Commands.c" @@ -19829,7 +19829,7 @@ static void modify_tags_command_finalize (GObject* obj) { #line 2178 "/home/jens/Source/shotwell/src/Commands.vala" _tmp2_ = _proxy_list; #line 2178 "/home/jens/Source/shotwell/src/Commands.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 2178 "/home/jens/Source/shotwell/src/Commands.vala" _tmp4_ = _tmp3_; #line 2178 "/home/jens/Source/shotwell/src/Commands.vala" @@ -19902,7 +19902,7 @@ static void modify_tags_command_finalize (GObject* obj) { #line 2181 "/home/jens/Source/shotwell/src/Commands.vala" _tmp15_ = _proxy_list; #line 2181 "/home/jens/Source/shotwell/src/Commands.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 2181 "/home/jens/Source/shotwell/src/Commands.vala" _tmp17_ = _tmp16_; #line 2181 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20185,7 +20185,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag #line 2247 "/home/jens/Source/shotwell/src/Commands.vala" tag_attach_many (_tmp1_, _tmp2_); #line 2249 "/home/jens/Source/shotwell/src/Commands.vala" - _tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 2249 "/home/jens/Source/shotwell/src/Commands.vala" _g_object_unref0 (self->priv->attached_to); #line 2249 "/home/jens/Source/shotwell/src/Commands.vala" @@ -20546,9 +20546,9 @@ static void tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * kl #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (TagUntagPhotosCommandPrivate)); #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->execute_on_source = tag_untag_photos_command_real_execute_on_source; + ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) tag_untag_photos_command_real_execute_on_source; #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" - ((SimpleProxyableCommandClass *) klass)->undo_on_source = tag_untag_photos_command_real_undo_on_source; + ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) tag_untag_photos_command_real_undo_on_source; #line 2206 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = tag_untag_photos_command_finalize; #line 20555 "Commands.c" @@ -20771,9 +20771,9 @@ static void rename_saved_search_command_class_init (RenameSavedSearchCommandClas #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (RenameSavedSearchCommandPrivate)); #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = rename_saved_search_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) rename_saved_search_command_real_execute; #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = rename_saved_search_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) rename_saved_search_command_real_undo; #line 2299 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = rename_saved_search_command_finalize; #line 20780 "Commands.c" @@ -20917,9 +20917,9 @@ static void delete_saved_search_command_class_init (DeleteSavedSearchCommandClas #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (DeleteSavedSearchCommandPrivate)); #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = delete_saved_search_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) delete_saved_search_command_real_execute; #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = delete_saved_search_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) delete_saved_search_command_real_undo; #line 2323 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = delete_saved_search_command_finalize; #line 20926 "Commands.c" @@ -21679,9 +21679,9 @@ static void trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandCl #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (TrashUntrashPhotosCommandPrivate)); #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->execute = trash_untrash_photos_command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) trash_untrash_photos_command_real_execute; #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" - ((CommandClass *) klass)->undo = trash_untrash_photos_command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) trash_untrash_photos_command_real_undo; #line 2341 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = trash_untrash_photos_command_finalize; #line 21688 "Commands.c" @@ -22065,9 +22065,9 @@ static void flag_unflag_command_class_init (FlagUnflagCommandClass * klass) { #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" g_type_class_add_private (klass, sizeof (FlagUnflagCommandPrivate)); #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = flag_unflag_command_real_execute_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) flag_unflag_command_real_execute_on_all; #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" - ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = flag_unflag_command_real_undo_on_all; + ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) flag_unflag_command_real_undo_on_all; #line 2451 "/home/jens/Source/shotwell/src/Commands.vala" G_OBJECT_CLASS (klass)->finalize = flag_unflag_command_finalize; #line 22074 "Commands.c" |