From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/CommandManager.c | 710 ++++++++++++++++++++++++++++----------------------- 1 file changed, 394 insertions(+), 316 deletions(-) (limited to 'src/CommandManager.c') diff --git a/src/CommandManager.c b/src/CommandManager.c index bc54284..baf7d78 100644 --- a/src/CommandManager.c +++ b/src/CommandManager.c @@ -1,4 +1,4 @@ -/* CommandManager.c generated by valac 0.36.6, the Vala compiler +/* CommandManager.c generated by valac 0.40.4, the Vala compiler * generated from CommandManager.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -43,15 +44,20 @@ typedef struct _CommandPrivate CommandPrivate; typedef struct _CommandManager CommandManager; typedef struct _CommandManagerClass CommandManagerClass; +enum { + COMMAND_0_PROPERTY, + COMMAND_NUM_PROPERTIES +}; +static GParamSpec* command_properties[COMMAND_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) typedef struct _CommandManagerPrivate CommandManagerPrivate; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) typedef struct _ParamSpecCommandManager ParamSpecCommandManager; enum { COMMAND_MANAGER_ALTERED_SIGNAL, - COMMAND_MANAGER_LAST_SIGNAL + COMMAND_MANAGER_NUM_SIGNALS }; -static guint command_manager_signals[COMMAND_MANAGER_LAST_SIGNAL] = {0}; +static guint command_manager_signals[COMMAND_MANAGER_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -117,16 +123,21 @@ gchar* command_description_get_explanation (CommandDescription* self); GType command_get_type (void) G_GNUC_CONST; gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; #define COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COMMAND, CommandPrivate)) -enum { - COMMAND_DUMMY_PROPERTY -}; -Command* command_construct (GType object_type, const gchar* name, const gchar* explanation); +Command* command_construct (GType object_type, + const gchar* name, + const gchar* explanation); void command_prepare (Command* self); static void command_real_prepare (Command* self); void command_execute (Command* self); @@ -135,68 +146,87 @@ void command_undo (Command* self); static void command_real_undo (Command* self); void command_redo (Command* self); static void command_real_redo (Command* self); -gboolean command_compress (Command* self, Command* command); -static gboolean command_real_compress (Command* self, Command* command); +gboolean command_compress (Command* self, + Command* command); +static gboolean command_real_compress (Command* self, + Command* command); gchar* command_get_name (Command* self); static gchar* command_real_get_name (Command* self); gchar* command_get_explanation (Command* self); static gchar* command_real_get_explanation (Command* self); CommandManager* command_get_command_manager (Command* self); -void command_internal_set_command_manager (Command* self, CommandManager* manager); +void command_internal_set_command_manager (Command* self, + CommandManager* manager); static void command_finalize (GObject * obj); #define COMMAND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COMMAND_MANAGER, CommandManagerPrivate)) -enum { - COMMAND_MANAGER_DUMMY_PROPERTY -}; #define COMMAND_MANAGER_DEFAULT_DEPTH 20 CommandManager* command_manager_new (gint depth); -CommandManager* command_manager_construct (GType object_type, gint depth); +CommandManager* command_manager_construct (GType object_type, + gint depth); void command_manager_reset (CommandManager* self); -void command_manager_execute (CommandManager* self, Command* command); -static Command* command_manager_top (CommandManager* self, GeeArrayList* stack); -static void command_manager_push (CommandManager* self, GeeArrayList* stack, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); +static Command* command_manager_top (CommandManager* self, + GeeArrayList* stack); +static void command_manager_push (CommandManager* self, + GeeArrayList* stack, + Command* command); gboolean command_manager_can_undo (CommandManager* self); gboolean command_manager_can_redo (CommandManager* self); CommandDescription* command_manager_get_undo_description (CommandManager* self); gboolean command_manager_undo (CommandManager* self); -static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack); +static Command* command_manager_pop (CommandManager* self, + GeeArrayList* stack); CommandDescription* command_manager_get_redo_description (CommandManager* self); gboolean command_manager_redo (CommandManager* self); -static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); static void command_manager_finalize (CommandManager * obj); -gchar* command_description_get_name (CommandDescription* self) { +gchar* +command_description_get_name (CommandDescription* self) +{ #line 8 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_DESCRIPTION (self), NULL); #line 8 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_DESCRIPTION_GET_INTERFACE (self)->get_name (self); -#line 175 "CommandManager.c" +#line 199 "CommandManager.c" } -gchar* command_description_get_explanation (CommandDescription* self) { +gchar* +command_description_get_explanation (CommandDescription* self) +{ #line 10 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_DESCRIPTION (self), NULL); #line 10 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_DESCRIPTION_GET_INTERFACE (self)->get_explanation (self); -#line 184 "CommandManager.c" +#line 210 "CommandManager.c" } -static void command_description_base_init (CommandDescriptionIface * iface) { +static void +command_description_base_init (CommandDescriptionIface * iface) +{ #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala" static gboolean initialized = FALSE; #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala" if (!initialized) { #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala" initialized = TRUE; -#line 195 "CommandManager.c" +#line 223 "CommandManager.c" } } -GType command_description_get_type (void) { +GType +command_description_get_type (void) +{ static volatile gsize command_description_type_id__volatile = 0; if (g_once_init_enter (&command_description_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CommandDescriptionIface), (GBaseInitFunc) command_description_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; @@ -209,12 +239,14 @@ GType command_description_get_type (void) { } -Command* command_construct (GType object_type, const gchar* name, const gchar* explanation) { +Command* +command_construct (GType object_type, + const gchar* name, + const gchar* explanation) +{ Command * self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (name != NULL, NULL); #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -222,93 +254,108 @@ Command* command_construct (GType object_type, const gchar* name, const gchar* e #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" self = (Command*) g_object_new (object_type, NULL); #line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = name; -#line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_free0 (self->priv->name); #line 33 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->name = _tmp1_; -#line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = explanation; + self->priv->name = _tmp0_; #line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (explanation); #line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_free0 (self->priv->explanation); #line 34 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->explanation = _tmp3_; + self->priv->explanation = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala" return self; -#line 243 "CommandManager.c" +#line 271 "CommandManager.c" } -static void command_real_prepare (Command* self) { +static void +command_real_prepare (Command* self) +{ } -void command_prepare (Command* self) { +void +command_prepare (Command* self) +{ #line 43 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 43 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->prepare (self); -#line 256 "CommandManager.c" +#line 288 "CommandManager.c" } -static void command_real_execute (Command* self) { +static void +command_real_execute (Command* self) +{ #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" g_critical ("Type `%s' does not implement abstract method `command_execute'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" return; -#line 265 "CommandManager.c" +#line 299 "CommandManager.c" } -void command_execute (Command* self) { +void +command_execute (Command* self) +{ #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->execute (self); -#line 274 "CommandManager.c" +#line 310 "CommandManager.c" } -static void command_real_undo (Command* self) { +static void +command_real_undo (Command* self) +{ #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" g_critical ("Type `%s' does not implement abstract method `command_undo'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" return; -#line 283 "CommandManager.c" +#line 321 "CommandManager.c" } -void command_undo (Command* self) { +void +command_undo (Command* self) +{ #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->undo (self); -#line 292 "CommandManager.c" +#line 332 "CommandManager.c" } -static void command_real_redo (Command* self) { +static void +command_real_redo (Command* self) +{ #line 51 "/home/jens/Source/shotwell/src/CommandManager.vala" command_execute (self); -#line 299 "CommandManager.c" +#line 341 "CommandManager.c" } -void command_redo (Command* self) { +void +command_redo (Command* self) +{ #line 50 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 50 "/home/jens/Source/shotwell/src/CommandManager.vala" COMMAND_GET_CLASS (self)->redo (self); -#line 308 "CommandManager.c" +#line 352 "CommandManager.c" } -static gboolean command_real_compress (Command* self, Command* command) { +static gboolean +command_real_compress (Command* self, + Command* command) +{ gboolean result = FALSE; #line 56 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); @@ -316,20 +363,25 @@ static gboolean command_real_compress (Command* self, Command* command) { result = FALSE; #line 57 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 320 "CommandManager.c" +#line 367 "CommandManager.c" } -gboolean command_compress (Command* self, Command* command) { +gboolean +command_compress (Command* self, + Command* command) +{ #line 56 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (self), FALSE); #line 56 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_GET_CLASS (self)->compress (self, command); -#line 329 "CommandManager.c" +#line 379 "CommandManager.c" } -static gchar* command_real_get_name (Command* self) { +static gchar* +command_real_get_name (Command* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -341,20 +393,24 @@ static gchar* command_real_get_name (Command* self) { result = _tmp1_; #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 345 "CommandManager.c" +#line 397 "CommandManager.c" } -gchar* command_get_name (Command* self) { +gchar* +command_get_name (Command* self) +{ #line 60 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (self), NULL); #line 60 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_GET_CLASS (self)->get_name (self); -#line 354 "CommandManager.c" +#line 408 "CommandManager.c" } -static gchar* command_real_get_explanation (Command* self) { +static gchar* +command_real_get_explanation (Command* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -366,27 +422,33 @@ static gchar* command_real_get_explanation (Command* self) { result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 370 "CommandManager.c" +#line 426 "CommandManager.c" } -gchar* command_get_explanation (Command* self) { +gchar* +command_get_explanation (Command* self) +{ #line 64 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND (self), NULL); #line 64 "/home/jens/Source/shotwell/src/CommandManager.vala" return COMMAND_GET_CLASS (self)->get_explanation (self); -#line 379 "CommandManager.c" +#line 437 "CommandManager.c" } -static gpointer _command_manager_ref0 (gpointer self) { +static gpointer +_command_manager_ref0 (gpointer self) +{ #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala" return self ? command_manager_ref (self) : NULL; -#line 386 "CommandManager.c" +#line 446 "CommandManager.c" } -CommandManager* command_get_command_manager (Command* self) { +CommandManager* +command_get_command_manager (Command* self) +{ CommandManager* result = NULL; CommandManager* _tmp0_; CommandManager* _tmp1_; @@ -400,13 +462,15 @@ CommandManager* command_get_command_manager (Command* self) { result = _tmp1_; #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 404 "CommandManager.c" +#line 466 "CommandManager.c" } -void command_internal_set_command_manager (Command* self, CommandManager* manager) { +void +command_internal_set_command_manager (Command* self, + CommandManager* manager) +{ CommandManager* _tmp0_; - CommandManager* _tmp1_; #line 73 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (self)); #line 73 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -416,14 +480,14 @@ void command_internal_set_command_manager (Command* self, CommandManager* manage #line 74 "/home/jens/Source/shotwell/src/CommandManager.vala" _vala_assert (_tmp0_ == NULL, "this.manager == null"); #line 76 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = manager; -#line 76 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->manager = _tmp1_; -#line 423 "CommandManager.c" + self->priv->manager = manager; +#line 485 "CommandManager.c" } -static void command_class_init (CommandClass * klass) { +static void +command_class_init (CommandClass * klass) +{ #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" command_parent_class = g_type_class_peek_parent (klass); #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -444,31 +508,37 @@ static void command_class_init (CommandClass * klass) { ((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 448 "CommandManager.c" +#line 512 "CommandManager.c" } -static void command_command_description_interface_init (CommandDescriptionIface * iface) { +static void +command_command_description_interface_init (CommandDescriptionIface * iface) +{ #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" command_command_description_parent_iface = g_type_interface_peek_parent (iface); #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" iface->get_name = (gchar* (*) (CommandDescription *)) command_get_name; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" iface->get_explanation = (gchar* (*) (CommandDescription *)) command_get_explanation; -#line 459 "CommandManager.c" +#line 525 "CommandManager.c" } -static void command_instance_init (Command * self) { +static void +command_instance_init (Command * self) +{ #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" self->priv = COMMAND_GET_PRIVATE (self); #line 30 "/home/jens/Source/shotwell/src/CommandManager.vala" self->priv->manager = NULL; -#line 468 "CommandManager.c" +#line 536 "CommandManager.c" } -static void command_finalize (GObject * obj) { +static void +command_finalize (GObject * obj) +{ Command * self; #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMMAND, Command); @@ -478,11 +548,13 @@ static void command_finalize (GObject * obj) { _g_free0 (self->priv->explanation); #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala" G_OBJECT_CLASS (command_parent_class)->finalize (obj); -#line 482 "CommandManager.c" +#line 552 "CommandManager.c" } -GType command_get_type (void) { +GType +command_get_type (void) +{ static volatile gsize command_type_id__volatile = 0; if (g_once_init_enter (&command_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (CommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Command), 0, (GInstanceInitFunc) command_instance_init, NULL }; @@ -496,34 +568,35 @@ GType command_get_type (void) { } -CommandManager* command_manager_construct (GType object_type, gint depth) { +CommandManager* +command_manager_construct (GType object_type, + gint depth) +{ CommandManager* self = NULL; - gint _tmp0_; - gint _tmp1_; #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala" self = (CommandManager*) g_type_create_instance (object_type); #line 90 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = depth; -#line 90 "/home/jens/Source/shotwell/src/CommandManager.vala" - _vala_assert (_tmp0_ > 0, "depth > 0"); -#line 92 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = depth; + _vala_assert (depth > 0, "depth > 0"); #line 92 "/home/jens/Source/shotwell/src/CommandManager.vala" - self->priv->depth = _tmp1_; + self->priv->depth = depth; #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala" return self; -#line 516 "CommandManager.c" +#line 585 "CommandManager.c" } -CommandManager* command_manager_new (gint depth) { +CommandManager* +command_manager_new (gint depth) +{ #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala" return command_manager_construct (TYPE_COMMAND_MANAGER, depth); -#line 523 "CommandManager.c" +#line 594 "CommandManager.c" } -void command_manager_reset (CommandManager* self) { +void +command_manager_reset (CommandManager* self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 95 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -538,91 +611,72 @@ void command_manager_reset (CommandManager* self) { gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 99 "/home/jens/Source/shotwell/src/CommandManager.vala" g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, FALSE, FALSE); -#line 542 "CommandManager.c" +#line 615 "CommandManager.c" } -void command_manager_execute (CommandManager* self, Command* command) { - Command* _tmp0_; - GeeArrayList* _tmp1_; +void +command_manager_execute (CommandManager* self, + Command* command) +{ + GeeArrayList* _tmp0_; Command* top_command = NULL; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; + Command* _tmp2_; Command* _tmp3_; - Command* _tmp4_; - GeeArrayList* _tmp8_; - Command* _tmp9_; - Command* _tmp10_; - Command* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; + GeeArrayList* _tmp5_; #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND_MANAGER (self)); #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (command)); #line 104 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = command; -#line 104 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_internal_set_command_manager (_tmp0_, self); + command_internal_set_command_manager (command, self); #line 107 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = self->priv->redo_stack; + _tmp0_ = self->priv->redo_stack; #line 107 "/home/jens/Source/shotwell/src/CommandManager.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 110 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = self->priv->undo_stack; + _tmp1_ = self->priv->undo_stack; #line 110 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = command_manager_top (self, _tmp2_); + _tmp2_ = command_manager_top (self, _tmp1_); #line 110 "/home/jens/Source/shotwell/src/CommandManager.vala" - top_command = _tmp3_; + top_command = _tmp2_; #line 111 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp4_ = top_command; + _tmp3_ = top_command; #line 111 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (_tmp4_ != NULL) { -#line 581 "CommandManager.c" - Command* _tmp5_; - Command* _tmp6_; - gboolean _tmp7_; + if (_tmp3_ != NULL) { +#line 649 "CommandManager.c" + Command* _tmp4_; #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp5_ = top_command; + _tmp4_ = top_command; #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = command; -#line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = command_compress (_tmp5_, _tmp6_); -#line 112 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (_tmp7_) { + if (command_compress (_tmp4_, command)) { #line 113 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (top_command); #line 113 "/home/jens/Source/shotwell/src/CommandManager.vala" return; -#line 597 "CommandManager.c" +#line 659 "CommandManager.c" } } #line 117 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = self->priv->undo_stack; -#line 117 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp9_ = command; + _tmp5_ = self->priv->undo_stack; #line 117 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_manager_push (self, _tmp8_, _tmp9_); + command_manager_push (self, _tmp5_, command); #line 119 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp10_ = command; -#line 119 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_prepare (_tmp10_); -#line 120 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp11_ = command; + command_prepare (command); #line 120 "/home/jens/Source/shotwell/src/CommandManager.vala" - command_execute (_tmp11_); + command_execute (command); #line 123 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp12_ = command_manager_can_undo (self); -#line 123 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp13_ = command_manager_can_redo (self); -#line 123 "/home/jens/Source/shotwell/src/CommandManager.vala" - g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp12_, _tmp13_); + g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, command_manager_can_undo (self), command_manager_can_redo (self)); #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (top_command); -#line 622 "CommandManager.c" +#line 674 "CommandManager.c" } -gboolean command_manager_can_undo (CommandManager* self) { +gboolean +command_manager_can_undo (CommandManager* self) +{ gboolean result = FALSE; GeeArrayList* _tmp0_; gint _tmp1_; @@ -639,11 +693,13 @@ gboolean command_manager_can_undo (CommandManager* self) { result = _tmp2_ > 0; #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 643 "CommandManager.c" +#line 697 "CommandManager.c" } -CommandDescription* command_manager_get_undo_description (CommandManager* self) { +CommandDescription* +command_manager_get_undo_description (CommandManager* self) +{ CommandDescription* result = NULL; GeeArrayList* _tmp0_; Command* _tmp1_; @@ -657,11 +713,13 @@ CommandDescription* command_manager_get_undo_description (CommandManager* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND_DESCRIPTION, CommandDescription); #line 131 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 661 "CommandManager.c" +#line 717 "CommandManager.c" } -gboolean command_manager_undo (CommandManager* self) { +gboolean +command_manager_undo (CommandManager* self) +{ gboolean result = FALSE; Command* command = NULL; GeeArrayList* _tmp0_; @@ -671,8 +729,6 @@ gboolean command_manager_undo (CommandManager* self) { Command* _tmp4_; Command* _tmp5_; Command* _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; #line 134 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE); #line 135 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -691,7 +747,7 @@ gboolean command_manager_undo (CommandManager* self) { _g_object_unref0 (command); #line 137 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 695 "CommandManager.c" +#line 751 "CommandManager.c" } #line 140 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp3_ = self->priv->redo_stack; @@ -708,22 +764,20 @@ gboolean command_manager_undo (CommandManager* self) { #line 144 "/home/jens/Source/shotwell/src/CommandManager.vala" command_undo (_tmp6_); #line 147 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = command_manager_can_undo (self); -#line 147 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = command_manager_can_redo (self); -#line 147 "/home/jens/Source/shotwell/src/CommandManager.vala" - g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_); + g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, command_manager_can_undo (self), command_manager_can_redo (self)); #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala" result = TRUE; #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (command); #line 149 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 723 "CommandManager.c" +#line 775 "CommandManager.c" } -gboolean command_manager_can_redo (CommandManager* self) { +gboolean +command_manager_can_redo (CommandManager* self) +{ gboolean result = FALSE; GeeArrayList* _tmp0_; gint _tmp1_; @@ -740,11 +794,13 @@ gboolean command_manager_can_redo (CommandManager* self) { result = _tmp2_ > 0; #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 744 "CommandManager.c" +#line 798 "CommandManager.c" } -CommandDescription* command_manager_get_redo_description (CommandManager* self) { +CommandDescription* +command_manager_get_redo_description (CommandManager* self) +{ CommandDescription* result = NULL; GeeArrayList* _tmp0_; Command* _tmp1_; @@ -758,11 +814,13 @@ CommandDescription* command_manager_get_redo_description (CommandManager* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND_DESCRIPTION, CommandDescription); #line 157 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 762 "CommandManager.c" +#line 818 "CommandManager.c" } -gboolean command_manager_redo (CommandManager* self) { +gboolean +command_manager_redo (CommandManager* self) +{ gboolean result = FALSE; Command* command = NULL; GeeArrayList* _tmp0_; @@ -772,8 +830,6 @@ gboolean command_manager_redo (CommandManager* self) { Command* _tmp4_; Command* _tmp5_; Command* _tmp6_; - gboolean _tmp7_; - gboolean _tmp8_; #line 160 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE); #line 161 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -792,7 +848,7 @@ gboolean command_manager_redo (CommandManager* self) { _g_object_unref0 (command); #line 163 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 796 "CommandManager.c" +#line 852 "CommandManager.c" } #line 166 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp3_ = self->priv->undo_stack; @@ -809,78 +865,70 @@ gboolean command_manager_redo (CommandManager* self) { #line 170 "/home/jens/Source/shotwell/src/CommandManager.vala" command_redo (_tmp6_); #line 173 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = command_manager_can_undo (self); -#line 173 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = command_manager_can_redo (self); -#line 173 "/home/jens/Source/shotwell/src/CommandManager.vala" - g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_); + g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, command_manager_can_undo (self), command_manager_can_redo (self)); #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala" result = TRUE; #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (command); #line 175 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 824 "CommandManager.c" +#line 876 "CommandManager.c" } -static Command* command_manager_top (CommandManager* self, GeeArrayList* stack) { +static Command* +command_manager_top (CommandManager* self, + GeeArrayList* stack) +{ Command* result = NULL; Command* _tmp0_ = NULL; - GeeArrayList* _tmp1_; + gint _tmp1_; gint _tmp2_; - gint _tmp3_; #line 178 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL); #line 178 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (stack), NULL); #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_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, 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" - if (_tmp3_ > 0) { -#line 846 "CommandManager.c" - GeeArrayList* _tmp4_; - GeeArrayList* _tmp5_; - gint _tmp6_; - gint _tmp7_; - gpointer _tmp8_; -#line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp4_ = stack; + _tmp2_ = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp5_ = stack; + if (_tmp2_ > 0) { +#line 898 "CommandManager.c" + gint _tmp3_; + gint _tmp4_; + gpointer _tmp5_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_ - 1); + _tmp5_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp4_ - 1); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (_tmp0_); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = (Command*) _tmp8_; -#line 866 "CommandManager.c" + _tmp0_ = (Command*) _tmp5_; +#line 912 "CommandManager.c" } else { #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (_tmp0_); #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" _tmp0_ = NULL; -#line 872 "CommandManager.c" +#line 918 "CommandManager.c" } #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" result = _tmp0_; #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 878 "CommandManager.c" +#line 924 "CommandManager.c" } -static void command_manager_push (CommandManager* self, GeeArrayList* stack, Command* command) { - GeeArrayList* _tmp0_; - Command* _tmp1_; +static void +command_manager_push (CommandManager* self, + GeeArrayList* stack, + Command* command) +{ #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND_MANAGER (self)); #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -888,115 +936,100 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com #line 182 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (IS_COMMAND (command)); #line 183 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = stack; -#line 183 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp1_ = command; -#line 183 "/home/jens/Source/shotwell/src/CommandManager.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), command); #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" while (TRUE) { -#line 899 "CommandManager.c" - GeeArrayList* _tmp2_; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_; - GeeArrayList* _tmp6_; - gpointer _tmp7_; - Command* _tmp8_; +#line 943 "CommandManager.c" + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gpointer _tmp3_; + Command* _tmp4_; #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp2_ = stack; + _tmp0_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp1_ = _tmp0_; #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp4_ = _tmp3_; + _tmp2_ = self->priv->depth; #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp5_ = self->priv->depth; -#line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (!(_tmp4_ >= _tmp5_)) { + if (!(_tmp1_ >= _tmp2_)) { #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala" break; -#line 919 "CommandManager.c" +#line 959 "CommandManager.c" } #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = stack; -#line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp3_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = (Command*) _tmp7_; + _tmp4_ = (Command*) _tmp3_; #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala" - _g_object_unref0 (_tmp8_); -#line 929 "CommandManager.c" + _g_object_unref0 (_tmp4_); +#line 967 "CommandManager.c" } } -static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack) { +static Command* +command_manager_pop (CommandManager* self, + GeeArrayList* stack) +{ Command* result = NULL; - GeeArrayList* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; Command* command = NULL; - GeeArrayList* _tmp3_; - GeeArrayList* _tmp4_; - gint _tmp5_; - gint _tmp6_; - gpointer _tmp7_; + gint _tmp2_; + gint _tmp3_; + gpointer _tmp4_; gboolean removed = FALSE; - GeeArrayList* _tmp8_; - Command* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + Command* _tmp5_; + gboolean _tmp6_; #line 190 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL); #line 190 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (stack), NULL); #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp0_ = stack; + _tmp0_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" - _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_; + _tmp1_ = _tmp0_; #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala" - if (_tmp2_ <= 0) { + if (_tmp1_ <= 0) { #line 192 "/home/jens/Source/shotwell/src/CommandManager.vala" result = NULL; #line 192 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 966 "CommandManager.c" +#line 1000 "CommandManager.c" } #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp3_ = stack; + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #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_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp6_ - 1); + _tmp4_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp3_ - 1); #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala" - command = (Command*) _tmp7_; -#line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp8_ = stack; -#line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp9_ = command; + command = (Command*) _tmp4_; #line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp10_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); + _tmp5_ = command; #line 195 "/home/jens/Source/shotwell/src/CommandManager.vala" - removed = _tmp10_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (stack, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_); #line 196 "/home/jens/Source/shotwell/src/CommandManager.vala" - _tmp11_ = removed; + _tmp6_ = removed; #line 196 "/home/jens/Source/shotwell/src/CommandManager.vala" - _vala_assert (_tmp11_, "removed"); + _vala_assert (_tmp6_, "removed"); #line 198 "/home/jens/Source/shotwell/src/CommandManager.vala" result = command; #line 198 "/home/jens/Source/shotwell/src/CommandManager.vala" return result; -#line 996 "CommandManager.c" +#line 1022 "CommandManager.c" } -static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__BOOLEAN_BOOLEAN) (gpointer data1, gboolean arg_1, gboolean arg_2, gpointer data2); register GMarshalFunc_VOID__BOOLEAN_BOOLEAN callback; register GCClosure * cc; @@ -1011,120 +1044,145 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN (GClosure * closure, G data1 = closure->data; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" data2 = param_values->data[0].v_pointer; -#line 1015 "CommandManager.c" +#line 1048 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" data1 = param_values->data[0].v_pointer; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" data2 = closure->data; -#line 1021 "CommandManager.c" +#line 1054 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), data2); -#line 1027 "CommandManager.c" +#line 1060 "CommandManager.c" } -static void value_command_manager_init (GValue* value) { +static void +value_command_manager_init (GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1034 "CommandManager.c" +#line 1069 "CommandManager.c" } -static void value_command_manager_free_value (GValue* value) { +static void +value_command_manager_free_value (GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (value->data[0].v_pointer) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_unref (value->data[0].v_pointer); -#line 1043 "CommandManager.c" +#line 1080 "CommandManager.c" } } -static void value_command_manager_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_command_manager_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (src_value->data[0].v_pointer) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" dest_value->data[0].v_pointer = command_manager_ref (src_value->data[0].v_pointer); -#line 1053 "CommandManager.c" +#line 1093 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" dest_value->data[0].v_pointer = NULL; -#line 1057 "CommandManager.c" +#line 1097 "CommandManager.c" } } -static gpointer value_command_manager_peek_pointer (const GValue* value) { +static gpointer +value_command_manager_peek_pointer (const GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return value->data[0].v_pointer; -#line 1065 "CommandManager.c" +#line 1107 "CommandManager.c" } -static gchar* value_command_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_command_manager_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (collect_values[0].v_pointer) { -#line 1072 "CommandManager.c" +#line 1119 "CommandManager.c" CommandManager * object; object = collect_values[0].v_pointer; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (object->parent_instance.g_class == NULL) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1079 "CommandManager.c" +#line 1126 "CommandManager.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1083 "CommandManager.c" +#line 1130 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = command_manager_ref (object); -#line 1087 "CommandManager.c" +#line 1134 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1091 "CommandManager.c" +#line 1138 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return NULL; -#line 1095 "CommandManager.c" +#line 1142 "CommandManager.c" } -static gchar* value_command_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_command_manager_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ CommandManager ** object_p; object_p = collect_values[0].v_pointer; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (!object_p) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1106 "CommandManager.c" +#line 1158 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (!value->data[0].v_pointer) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" *object_p = NULL; -#line 1112 "CommandManager.c" +#line 1164 "CommandManager.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" *object_p = value->data[0].v_pointer; -#line 1116 "CommandManager.c" +#line 1168 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" *object_p = command_manager_ref (value->data[0].v_pointer); -#line 1120 "CommandManager.c" +#line 1172 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return NULL; -#line 1124 "CommandManager.c" +#line 1176 "CommandManager.c" } -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecCommandManager* spec; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_COMMAND_MANAGER), NULL); @@ -1134,20 +1192,25 @@ GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return G_PARAM_SPEC (spec); -#line 1138 "CommandManager.c" +#line 1196 "CommandManager.c" } -gpointer value_get_command_manager (const GValue* value) { +gpointer +value_get_command_manager (const GValue* value) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER), NULL); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return value->data[0].v_pointer; -#line 1147 "CommandManager.c" +#line 1207 "CommandManager.c" } -void value_set_command_manager (GValue* value, gpointer v_object) { +void +value_set_command_manager (GValue* value, + gpointer v_object) +{ CommandManager * old; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER)); @@ -1163,22 +1226,25 @@ void value_set_command_manager (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_ref (value->data[0].v_pointer); -#line 1167 "CommandManager.c" +#line 1230 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1171 "CommandManager.c" +#line 1234 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (old) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_unref (old); -#line 1177 "CommandManager.c" +#line 1240 "CommandManager.c" } } -void value_take_command_manager (GValue* value, gpointer v_object) { +void +value_take_command_manager (GValue* value, + gpointer v_object) +{ CommandManager * old; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER)); @@ -1192,22 +1258,24 @@ void value_take_command_manager (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = v_object; -#line 1196 "CommandManager.c" +#line 1262 "CommandManager.c" } else { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" value->data[0].v_pointer = NULL; -#line 1200 "CommandManager.c" +#line 1266 "CommandManager.c" } #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" if (old) { #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_unref (old); -#line 1206 "CommandManager.c" +#line 1272 "CommandManager.c" } } -static void command_manager_class_init (CommandManagerClass * klass) { +static void +command_manager_class_init (CommandManagerClass * klass) +{ #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_parent_class = g_type_class_peek_parent (klass); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -1216,11 +1284,13 @@ static void command_manager_class_init (CommandManagerClass * klass) { g_type_class_add_private (klass, sizeof (CommandManagerPrivate)); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL] = g_signal_new ("altered", TYPE_COMMAND_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); -#line 1220 "CommandManager.c" +#line 1288 "CommandManager.c" } -static void command_manager_instance_init (CommandManager * self) { +static void +command_manager_instance_init (CommandManager * self) +{ GeeArrayList* _tmp0_; GeeArrayList* _tmp1_; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -1235,11 +1305,13 @@ static void command_manager_instance_init (CommandManager * self) { self->priv->redo_stack = _tmp1_; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" self->ref_count = 1; -#line 1239 "CommandManager.c" +#line 1309 "CommandManager.c" } -static void command_manager_finalize (CommandManager * obj) { +static void +command_manager_finalize (CommandManager * obj) +{ CommandManager * self; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMMAND_MANAGER, CommandManager); @@ -1249,11 +1321,13 @@ static void command_manager_finalize (CommandManager * obj) { _g_object_unref0 (self->priv->undo_stack); #line 85 "/home/jens/Source/shotwell/src/CommandManager.vala" _g_object_unref0 (self->priv->redo_stack); -#line 1253 "CommandManager.c" +#line 1325 "CommandManager.c" } -GType command_manager_get_type (void) { +GType +command_manager_get_type (void) +{ static volatile gsize command_manager_type_id__volatile = 0; if (g_once_init_enter (&command_manager_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_command_manager_init, value_command_manager_free_value, value_command_manager_copy_value, value_command_manager_peek_pointer, "p", value_command_manager_collect_value, "p", value_command_manager_lcopy_value }; @@ -1267,18 +1341,22 @@ GType command_manager_get_type (void) { } -gpointer command_manager_ref (gpointer instance) { +gpointer +command_manager_ref (gpointer instance) +{ CommandManager * self; self = instance; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_atomic_int_inc (&self->ref_count); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" return instance; -#line 1278 "CommandManager.c" +#line 1354 "CommandManager.c" } -void command_manager_unref (gpointer instance) { +void +command_manager_unref (gpointer instance) +{ CommandManager * self; self = instance; #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" @@ -1287,7 +1365,7 @@ void command_manager_unref (gpointer instance) { COMMAND_MANAGER_GET_CLASS (self)->finalize (self); #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1291 "CommandManager.c" +#line 1369 "CommandManager.c" } } -- cgit v1.2.3