Merge branch 'feature/upstream' into develop

1 files changed, 199 insertions, 194 deletions

diff --git a/src/CommandManager.c b/src/CommandManager.c
index a661c01..bc54284 100644
--- a/src/CommandManager.c
+++ b/src/CommandManager.c
@@ -1,4 +1,4 @@
-/* CommandManager.c generated by valac 0.34.7, the Vala compiler
+/* CommandManager.c generated by valac 0.36.6, the Vala compiler
  * generated from CommandManager.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -47,6 +47,11 @@ typedef struct _CommandManagerClass CommandManagerClass;
 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
+};
+static guint command_manager_signals[COMMAND_MANAGER_LAST_SIGNAL] = {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; }
@@ -103,7 +108,7 @@ struct _ParamSpecCommandManager {
 
 
 static gpointer command_parent_class = NULL;
-static CommandDescriptionIface* command_command_description_parent_iface = NULL;
+static CommandDescriptionIface * command_command_description_parent_iface = NULL;
 static gpointer command_manager_parent_class = NULL;
 
 GType command_description_get_type (void) G_GNUC_CONST;
@@ -138,7 +143,7 @@ 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);
-static void command_finalize (GObject* obj);
+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
@@ -158,7 +163,7 @@ 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 command_manager_finalize (CommandManager* obj);
+static void command_manager_finalize (CommandManager * obj);
 
 
 gchar* command_description_get_name (CommandDescription* self) {
@@ -166,7 +171,7 @@ gchar* command_description_get_name (CommandDescription* self) {
 	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 170 "CommandManager.c"
+#line 175 "CommandManager.c"
 }
 
 
@@ -175,7 +180,7 @@ gchar* command_description_get_explanation (CommandDescription* self) {
 	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 179 "CommandManager.c"
+#line 184 "CommandManager.c"
 }
 
 
@@ -186,7 +191,7 @@ static void command_description_base_init (CommandDescriptionIface * iface) {
 	if (!initialized) {
 #line 7 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		initialized = TRUE;
-#line 190 "CommandManager.c"
+#line 195 "CommandManager.c"
 	}
 }
 
@@ -206,10 +211,10 @@ GType command_description_get_type (void) {
 
 Command* command_construct (GType object_type, const gchar* name, const gchar* explanation) {
 	Command * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const 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"
@@ -234,7 +239,7 @@ Command* command_construct (GType object_type, const gchar* name, const gchar* e
 	self->priv->explanation = _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return self;
-#line 238 "CommandManager.c"
+#line 243 "CommandManager.c"
 }
 
 
@@ -247,7 +252,7 @@ void command_prepare (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 43 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->prepare (self);
-#line 251 "CommandManager.c"
+#line 256 "CommandManager.c"
 }
 
 
@@ -256,7 +261,7 @@ static void command_real_execute (Command* self) {
 	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 260 "CommandManager.c"
+#line 265 "CommandManager.c"
 }
 
 
@@ -265,7 +270,7 @@ void command_execute (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 46 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->execute (self);
-#line 269 "CommandManager.c"
+#line 274 "CommandManager.c"
 }
 
 
@@ -274,7 +279,7 @@ static void command_real_undo (Command* self) {
 	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 278 "CommandManager.c"
+#line 283 "CommandManager.c"
 }
 
 
@@ -283,14 +288,14 @@ void command_undo (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 48 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->undo (self);
-#line 287 "CommandManager.c"
+#line 292 "CommandManager.c"
 }
 
 
 static void command_real_redo (Command* self) {
 #line 51 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	command_execute (self);
-#line 294 "CommandManager.c"
+#line 299 "CommandManager.c"
 }
 
 
@@ -299,7 +304,7 @@ void command_redo (Command* self) {
 	g_return_if_fail (IS_COMMAND (self));
 #line 50 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	COMMAND_GET_CLASS (self)->redo (self);
-#line 303 "CommandManager.c"
+#line 308 "CommandManager.c"
 }
 
 
@@ -311,7 +316,7 @@ static gboolean command_real_compress (Command* self, Command* command) {
 	result = FALSE;
 #line 57 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 315 "CommandManager.c"
+#line 320 "CommandManager.c"
 }
 
 
@@ -320,14 +325,14 @@ gboolean command_compress (Command* self, Command* command) {
 	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 324 "CommandManager.c"
+#line 329 "CommandManager.c"
 }
 
 
 static gchar* command_real_get_name (Command* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp0_ = self->priv->name;
 #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -336,7 +341,7 @@ static gchar* command_real_get_name (Command* self) {
 	result = _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 340 "CommandManager.c"
+#line 345 "CommandManager.c"
 }
 
 
@@ -345,14 +350,14 @@ gchar* command_get_name (Command* self) {
 	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 349 "CommandManager.c"
+#line 354 "CommandManager.c"
 }
 
 
 static gchar* command_real_get_explanation (Command* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp0_ = self->priv->explanation;
 #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -361,7 +366,7 @@ static gchar* command_real_get_explanation (Command* self) {
 	result = _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 365 "CommandManager.c"
+#line 370 "CommandManager.c"
 }
 
 
@@ -370,21 +375,21 @@ gchar* command_get_explanation (Command* self) {
 	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 374 "CommandManager.c"
+#line 379 "CommandManager.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
 #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 381 "CommandManager.c"
+#line 386 "CommandManager.c"
 }
 
 
 CommandManager* command_get_command_manager (Command* self) {
 	CommandManager* result = NULL;
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	CommandManager* _tmp0_;
+	CommandManager* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND (self), NULL);
 #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -395,13 +400,13 @@ CommandManager* command_get_command_manager (Command* self) {
 	result = _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 399 "CommandManager.c"
+#line 404 "CommandManager.c"
 }
 
 
 void command_internal_set_command_manager (Command* self, CommandManager* manager) {
-	CommandManager* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
+	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"
@@ -414,7 +419,7 @@ void command_internal_set_command_manager (Command* self, CommandManager* manage
 	_tmp1_ = manager;
 #line 76 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->priv->manager = _tmp1_;
-#line 418 "CommandManager.c"
+#line 423 "CommandManager.c"
 }
 
 
@@ -424,22 +429,22 @@ 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 = (void (*)(Command*)) command_real_prepare;
+	((CommandClass *) klass)->prepare = (void (*) (Command *)) command_real_prepare;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->execute = (void (*)(Command*)) command_real_execute;
+	((CommandClass *) klass)->execute = (void (*) (Command *)) command_real_execute;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->undo = (void (*)(Command*)) command_real_undo;
+	((CommandClass *) klass)->undo = (void (*) (Command *)) command_real_undo;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->redo = (void (*)(Command*)) command_real_redo;
+	((CommandClass *) klass)->redo = (void (*) (Command *)) command_real_redo;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) 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 = (gchar* (*)(Command*)) 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 = (gchar* (*)(Command*)) 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"
+#line 448 "CommandManager.c"
 }
 
 
@@ -447,10 +452,10 @@ static void command_command_description_interface_init (CommandDescriptionIface
 #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;
+	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 454 "CommandManager.c"
+	iface->get_explanation = (gchar* (*) (CommandDescription *)) command_get_explanation;
+#line 459 "CommandManager.c"
 }
 
 
@@ -459,11 +464,11 @@ static void command_instance_init (Command * self) {
 	self->priv = COMMAND_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->priv->manager = NULL;
-#line 463 "CommandManager.c"
+#line 468 "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);
@@ -473,7 +478,7 @@ 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 477 "CommandManager.c"
+#line 482 "CommandManager.c"
 }
 
 
@@ -493,8 +498,8 @@ GType command_get_type (void) {
 
 CommandManager* command_manager_construct (GType object_type, gint depth) {
 	CommandManager* self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	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"
@@ -507,20 +512,20 @@ CommandManager* command_manager_construct (GType object_type, gint depth) {
 	self->priv->depth = _tmp1_;
 #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return self;
-#line 511 "CommandManager.c"
+#line 516 "CommandManager.c"
 }
 
 
 CommandManager* command_manager_new (gint depth) {
 #line 89 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return command_manager_construct (TYPE_COMMAND_MANAGER, depth);
-#line 518 "CommandManager.c"
+#line 523 "CommandManager.c"
 }
 
 
 void command_manager_reset (CommandManager* self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 #line 95 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (IS_COMMAND_MANAGER (self));
 #line 96 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -532,24 +537,24 @@ void command_manager_reset (CommandManager* self) {
 #line 97 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	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_by_name (self, "altered", FALSE, FALSE);
-#line 537 "CommandManager.c"
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, FALSE, FALSE);
+#line 542 "CommandManager.c"
 }
 
 
 void command_manager_execute (CommandManager* self, Command* command) {
-	Command* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	Command* _tmp0_;
+	GeeArrayList* _tmp1_;
 	Command* top_command = NULL;
-	GeeArrayList* _tmp2_ = NULL;
-	Command* _tmp3_ = NULL;
-	Command* _tmp4_ = NULL;
-	GeeArrayList* _tmp8_ = NULL;
-	Command* _tmp9_ = NULL;
-	Command* _tmp10_ = NULL;
-	Command* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
+	GeeArrayList* _tmp2_;
+	Command* _tmp3_;
+	Command* _tmp4_;
+	GeeArrayList* _tmp8_;
+	Command* _tmp9_;
+	Command* _tmp10_;
+	Command* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
 #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"
@@ -572,10 +577,10 @@ void command_manager_execute (CommandManager* self, Command* command) {
 	_tmp4_ = top_command;
 #line 111 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (_tmp4_ != NULL) {
-#line 576 "CommandManager.c"
-		Command* _tmp5_ = NULL;
-		Command* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+#line 581 "CommandManager.c"
+		Command* _tmp5_;
+		Command* _tmp6_;
+		gboolean _tmp7_;
 #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp5_ = top_command;
 #line 112 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -588,7 +593,7 @@ void command_manager_execute (CommandManager* self, Command* command) {
 			_g_object_unref0 (top_command);
 #line 113 "/home/jens/Source/shotwell/src/CommandManager.vala"
 			return;
-#line 592 "CommandManager.c"
+#line 597 "CommandManager.c"
 		}
 	}
 #line 117 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -610,18 +615,18 @@ void command_manager_execute (CommandManager* self, Command* command) {
 #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_by_name (self, "altered", _tmp12_, _tmp13_);
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp12_, _tmp13_);
 #line 102 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_g_object_unref0 (top_command);
-#line 617 "CommandManager.c"
+#line 622 "CommandManager.c"
 }
 
 
 gboolean command_manager_can_undo (CommandManager* self) {
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 126 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE);
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -634,14 +639,14 @@ gboolean command_manager_can_undo (CommandManager* self) {
 	result = _tmp2_ > 0;
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 638 "CommandManager.c"
+#line 643 "CommandManager.c"
 }
 
 
 CommandDescription* command_manager_get_undo_description (CommandManager* self) {
 	CommandDescription* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
 #line 130 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL);
 #line 131 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -652,22 +657,22 @@ 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 656 "CommandManager.c"
+#line 661 "CommandManager.c"
 }
 
 
 gboolean command_manager_undo (CommandManager* self) {
 	gboolean result = FALSE;
 	Command* command = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
-	Command* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	Command* _tmp4_ = NULL;
-	Command* _tmp5_ = NULL;
-	Command* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
+	Command* _tmp2_;
+	GeeArrayList* _tmp3_;
+	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"
@@ -686,7 +691,7 @@ gboolean command_manager_undo (CommandManager* self) {
 		_g_object_unref0 (command);
 #line 137 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		return result;
-#line 690 "CommandManager.c"
+#line 695 "CommandManager.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp3_ = self->priv->redo_stack;
@@ -707,22 +712,22 @@ gboolean command_manager_undo (CommandManager* 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_by_name (self, "altered", _tmp7_, _tmp8_);
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_);
 #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 718 "CommandManager.c"
+#line 723 "CommandManager.c"
 }
 
 
 gboolean command_manager_can_redo (CommandManager* self) {
 	gboolean result = FALSE;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 152 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), FALSE);
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -735,14 +740,14 @@ gboolean command_manager_can_redo (CommandManager* self) {
 	result = _tmp2_ > 0;
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 739 "CommandManager.c"
+#line 744 "CommandManager.c"
 }
 
 
 CommandDescription* command_manager_get_redo_description (CommandManager* self) {
 	CommandDescription* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
 #line 156 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_val_if_fail (IS_COMMAND_MANAGER (self), NULL);
 #line 157 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -753,22 +758,22 @@ 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 757 "CommandManager.c"
+#line 762 "CommandManager.c"
 }
 
 
 gboolean command_manager_redo (CommandManager* self) {
 	gboolean result = FALSE;
 	Command* command = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
-	Command* _tmp2_ = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	Command* _tmp4_ = NULL;
-	Command* _tmp5_ = NULL;
-	Command* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
+	Command* _tmp2_;
+	GeeArrayList* _tmp3_;
+	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"
@@ -787,7 +792,7 @@ gboolean command_manager_redo (CommandManager* self) {
 		_g_object_unref0 (command);
 #line 163 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		return result;
-#line 791 "CommandManager.c"
+#line 796 "CommandManager.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp3_ = self->priv->undo_stack;
@@ -808,23 +813,23 @@ gboolean command_manager_redo (CommandManager* 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_by_name (self, "altered", _tmp7_, _tmp8_);
+	g_signal_emit (self, command_manager_signals[COMMAND_MANAGER_ALTERED_SIGNAL], 0, _tmp7_, _tmp8_);
 #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 819 "CommandManager.c"
+#line 824 "CommandManager.c"
 }
 
 
 static Command* command_manager_top (CommandManager* self, GeeArrayList* stack) {
 	Command* result = NULL;
 	Command* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
+	GeeArrayList* _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"
@@ -837,12 +842,12 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack)
 	_tmp3_ = _tmp2_;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (_tmp3_ > 0) {
-#line 841 "CommandManager.c"
-		GeeArrayList* _tmp4_ = NULL;
-		GeeArrayList* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		gpointer _tmp8_ = NULL;
+#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;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -857,25 +862,25 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack)
 		_g_object_unref0 (_tmp0_);
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp0_ = (Command*) _tmp8_;
-#line 861 "CommandManager.c"
+#line 866 "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 867 "CommandManager.c"
+#line 872 "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 873 "CommandManager.c"
+#line 878 "CommandManager.c"
 }
 
 
 static void command_manager_push (CommandManager* self, GeeArrayList* stack, Command* command) {
-	GeeArrayList* _tmp0_ = NULL;
-	Command* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	Command* _tmp1_;
 #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"
@@ -890,14 +895,14 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	while (TRUE) {
-#line 894 "CommandManager.c"
-		GeeArrayList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-		GeeArrayList* _tmp6_ = NULL;
-		gpointer _tmp7_ = NULL;
-		Command* _tmp8_ = NULL;
+#line 899 "CommandManager.c"
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
+		GeeArrayList* _tmp6_;
+		gpointer _tmp7_;
+		Command* _tmp8_;
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp2_ = stack;
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -910,7 +915,7 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com
 		if (!(_tmp4_ >= _tmp5_)) {
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 			break;
-#line 914 "CommandManager.c"
+#line 919 "CommandManager.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp6_ = stack;
@@ -920,27 +925,27 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com
 		_tmp8_ = (Command*) _tmp7_;
 #line 187 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_g_object_unref0 (_tmp8_);
-#line 924 "CommandManager.c"
+#line 929 "CommandManager.c"
 	}
 }
 
 
 static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack) {
 	Command* result = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeArrayList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	Command* command = NULL;
-	GeeArrayList* _tmp3_ = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gpointer _tmp7_ = NULL;
+	GeeArrayList* _tmp3_;
+	GeeArrayList* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gpointer _tmp7_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp8_ = NULL;
-	Command* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
+	GeeArrayList* _tmp8_;
+	Command* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
 #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"
@@ -957,7 +962,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack)
 		result = NULL;
 #line 192 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		return result;
-#line 961 "CommandManager.c"
+#line 966 "CommandManager.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp3_ = stack;
@@ -987,7 +992,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack)
 	result = command;
 #line 198 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return result;
-#line 991 "CommandManager.c"
+#line 996 "CommandManager.c"
 }
 
 
@@ -1006,26 +1011,26 @@ 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 1010 "CommandManager.c"
+#line 1015 "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 1016 "CommandManager.c"
+#line 1021 "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 1022 "CommandManager.c"
+#line 1027 "CommandManager.c"
 }
 
 
 static void value_command_manager_init (GValue* value) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	value->data[0].v_pointer = NULL;
-#line 1029 "CommandManager.c"
+#line 1034 "CommandManager.c"
 }
 
 
@@ -1034,7 +1039,7 @@ static void value_command_manager_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		command_manager_unref (value->data[0].v_pointer);
-#line 1038 "CommandManager.c"
+#line 1043 "CommandManager.c"
 	}
 }
 
@@ -1044,11 +1049,11 @@ static void value_command_manager_copy_value (const GValue* src_value, GValue* d
 	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 1048 "CommandManager.c"
+#line 1053 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1052 "CommandManager.c"
+#line 1057 "CommandManager.c"
 	}
 }
 
@@ -1056,66 +1061,66 @@ static void value_command_manager_copy_value (const GValue* src_value, GValue* d
 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 1060 "CommandManager.c"
+#line 1065 "CommandManager.c"
 }
 
 
 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 1067 "CommandManager.c"
-		CommandManager* object;
+#line 1072 "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 1074 "CommandManager.c"
+#line 1079 "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 1078 "CommandManager.c"
+#line 1083 "CommandManager.c"
 		}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = command_manager_ref (object);
-#line 1082 "CommandManager.c"
+#line 1087 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = NULL;
-#line 1086 "CommandManager.c"
+#line 1091 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return NULL;
-#line 1090 "CommandManager.c"
+#line 1095 "CommandManager.c"
 }
 
 
 static gchar* value_command_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CommandManager** object_p;
+	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 1101 "CommandManager.c"
+#line 1106 "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 1107 "CommandManager.c"
+#line 1112 "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 1111 "CommandManager.c"
+#line 1116 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		*object_p = command_manager_ref (value->data[0].v_pointer);
-#line 1115 "CommandManager.c"
+#line 1120 "CommandManager.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	return NULL;
-#line 1119 "CommandManager.c"
+#line 1124 "CommandManager.c"
 }
 
 
@@ -1129,7 +1134,7 @@ 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 1133 "CommandManager.c"
+#line 1138 "CommandManager.c"
 }
 
 
@@ -1138,12 +1143,12 @@ gpointer value_get_command_manager (const GValue* value) {
 	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 1142 "CommandManager.c"
+#line 1147 "CommandManager.c"
 }
 
 
 void value_set_command_manager (GValue* value, gpointer v_object) {
-	CommandManager* old;
+	CommandManager * old;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER));
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -1158,23 +1163,23 @@ 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 1162 "CommandManager.c"
+#line 1167 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = NULL;
-#line 1166 "CommandManager.c"
+#line 1171 "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 1172 "CommandManager.c"
+#line 1177 "CommandManager.c"
 	}
 }
 
 
 void value_take_command_manager (GValue* value, gpointer v_object) {
-	CommandManager* old;
+	CommandManager * old;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMMAND_MANAGER));
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -1187,17 +1192,17 @@ 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 1191 "CommandManager.c"
+#line 1196 "CommandManager.c"
 	} else {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		value->data[0].v_pointer = NULL;
-#line 1195 "CommandManager.c"
+#line 1200 "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 1201 "CommandManager.c"
+#line 1206 "CommandManager.c"
 	}
 }
 
@@ -1210,14 +1215,14 @@ static void command_manager_class_init (CommandManagerClass * klass) {
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	g_type_class_add_private (klass, sizeof (CommandManagerPrivate));
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	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 1215 "CommandManager.c"
+	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"
 }
 
 
 static void command_manager_instance_init (CommandManager * self) {
-	GeeArrayList* _tmp0_ = NULL;
-	GeeArrayList* _tmp1_ = NULL;
+	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp1_;
 #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"
@@ -1230,11 +1235,11 @@ 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 1234 "CommandManager.c"
+#line 1239 "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);
@@ -1244,7 +1249,7 @@ 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 1248 "CommandManager.c"
+#line 1253 "CommandManager.c"
 }
 
 
@@ -1263,18 +1268,18 @@ GType command_manager_get_type (void) {
 
 
 gpointer command_manager_ref (gpointer instance) {
-	CommandManager* self;
+	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 1273 "CommandManager.c"
+#line 1278 "CommandManager.c"
 }
 
 
 void command_manager_unref (gpointer instance) {
-	CommandManager* self;
+	CommandManager * self;
 	self = instance;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1282,7 +1287,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 1286 "CommandManager.c"
+#line 1291 "CommandManager.c"
 	}
 }