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/CommandManager.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/CommandManager.c') diff --git a/src/CommandManager.c b/src/CommandManager.c index a6a282b..a661c01 100644 --- a/src/CommandManager.c +++ b/src/CommandManager.c @@ -1,4 +1,4 @@ -/* CommandManager.c generated by valac 0.34.4, the Vala compiler +/* CommandManager.c generated by valac 0.34.7, the Vala compiler * generated from CommandManager.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -424,19 +424,19 @@ static void command_class_init (CommandClass * klass) { #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" g_type_class_add_private (klass, sizeof (CommandPrivate)); #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" - ((CommandClass *) klass)->prepare = command_real_prepare; + ((CommandClass *) klass)->prepare = (void (*)(Command*)) command_real_prepare; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" - ((CommandClass *) klass)->execute = command_real_execute; + ((CommandClass *) klass)->execute = (void (*)(Command*)) command_real_execute; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" - ((CommandClass *) klass)->undo = command_real_undo; + ((CommandClass *) klass)->undo = (void (*)(Command*)) command_real_undo; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" - ((CommandClass *) klass)->redo = command_real_redo; + ((CommandClass *) klass)->redo = (void (*)(Command*)) command_real_redo; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" - ((CommandClass *) klass)->compress = command_real_compress; + ((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) command_real_compress; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" - ((CommandClass *) klass)->get_name = command_real_get_name; + ((CommandClass *) klass)->get_name = (gchar* (*)(Command*)) command_real_get_name; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" - ((CommandClass *) klass)->get_explanation = command_real_get_explanation; + ((CommandClass *) klass)->get_explanation = (gchar* (*)(Command*)) command_real_get_explanation; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" G_OBJECT_CLASS (klass)->finalize = command_finalize; #line 443 "CommandManager.c" @@ -627,7 +627,7 @@ gboolean command_manager_can_undo (CommandManager* self) { #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp0_ = self->priv->undo_stack; #line 127 "/home/jens/Source/shotwell/src/CommandManager.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 127 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp2_ = _tmp1_; #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -728,7 +728,7 @@ gboolean command_manager_can_redo (CommandManager* self) { #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp0_ = self->priv->redo_stack; #line 153 "/home/jens/Source/shotwell/src/CommandManager.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 153 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp2_ = _tmp1_; #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -832,7 +832,7 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack) #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp1_ = stack; #line 179 "/home/jens/Source/shotwell/src/CommandManager.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 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp3_ = _tmp2_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -848,7 +848,7 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack) #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp5_ = stack; #line 179 "/home/jens/Source/shotwell/src/CommandManager.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 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp7_ = _tmp6_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -901,7 +901,7 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp2_ = stack; #line 186 "/home/jens/Source/shotwell/src/CommandManager.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 186 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp4_ = _tmp3_; #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -948,7 +948,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack) #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp0_ = stack; #line 191 "/home/jens/Source/shotwell/src/CommandManager.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 191 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp2_ = _tmp1_; #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -964,7 +964,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack) #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp4_ = stack; #line 194 "/home/jens/Source/shotwell/src/CommandManager.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 194 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp6_ = _tmp5_; #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -1221,11 +1221,11 @@ static void command_manager_instance_init (CommandManager * self) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" self->priv = COMMAND_MANAGER_GET_PRIVATE (self); #line 84 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 84 "/home/jens/Source/shotwell/src/CommandManager.vala" self->priv->undo_stack = _tmp0_; #line 85 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 85 "/home/jens/Source/shotwell/src/CommandManager.vala" self->priv->redo_stack = _tmp1_; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" -- cgit v1.2.3