New upstream version 0.28.2upstream/0.28.2

1 files changed, 1327 insertions, 1335 deletions

diff --git a/src/Commands.c b/src/Commands.c
index a8e7b47..9abf048 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <gio/gio.h>
 #include <glib/gi18n-lib.h>
+#include "shotwell-graphics-processor.h"
 #include <gdk/gdk.h>
 #include <time.h>
 
@@ -665,16 +666,6 @@ typedef struct _CropCommandPrivate CropCommandPrivate;
 typedef struct _AdjustColorsSingleCommand AdjustColorsSingleCommand;
 typedef struct _AdjustColorsSingleCommandClass AdjustColorsSingleCommandClass;
 typedef struct _AdjustColorsSingleCommandPrivate AdjustColorsSingleCommandPrivate;
-
-#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
-#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
-#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-
-typedef struct _PixelTransformationBundle PixelTransformationBundle;
-typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
 #define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL)))
 
 #define TYPE_ADJUST_COLORS_MULTIPLE_COMMAND (adjust_colors_multiple_command_get_type ())
@@ -2314,13 +2305,6 @@ CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop,
 static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
 static void crop_command_finalize (GObject * obj);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
-gpointer pixel_transformation_bundle_ref (gpointer instance);
-void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation_bundle (const GValue* value);
-GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
 #define ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommandPrivate))
 enum  {
 	ADJUST_COLORS_SINGLE_COMMAND_DUMMY_PROPERTY
@@ -2484,7 +2468,7 @@ static void set_raw_developer_command_real_execute (Command* base);
 static void set_raw_developer_command_real_undo (Command* base);
 static void set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
 gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
-void photo_set_raw_developer (Photo* self, RawDeveloper d);
+void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify);
 static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
@@ -2753,28 +2737,28 @@ static void flag_unflag_command_finalize (GObject * obj);
 static void _page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
 	page_command_on_page_destroyed ((PageCommand*) self);
-#line 2757 "Commands.c"
+#line 2741 "Commands.c"
 }
 
 
 static void _page_command_on_photo_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
 	page_command_on_photo_destroyed ((PageCommand*) self);
-#line 2764 "Commands.c"
+#line 2748 "Commands.c"
 }
 
 
 static void _page_command_on_controller_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
 	page_command_on_controller_destroyed ((PageCommand*) self);
-#line 2771 "Commands.c"
+#line 2755 "Commands.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 27 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2778 "Commands.c"
+#line 2762 "Commands.c"
 }
 
 
@@ -2812,7 +2796,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 	_tmp5_ = self->priv->page;
 #line 20 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_ != NULL) {
-#line 2816 "Commands.c"
+#line 2800 "Commands.c"
 		Page* _tmp6_;
 		LibraryPhotoPage* photo_page = NULL;
 		Page* _tmp7_;
@@ -2832,7 +2816,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 		_tmp9_ = photo_page;
 #line 28 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp9_ != NULL) {
-#line 2836 "Commands.c"
+#line 2820 "Commands.c"
 			LibraryPhotoPage* _tmp10_;
 			Photo* _tmp11_;
 			LibraryPhotoPage* _tmp12_;
@@ -2859,21 +2843,21 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 			_tmp15_ = self->priv->library_photo;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp15_ != NULL) {
-#line 2863 "Commands.c"
+#line 2847 "Commands.c"
 				CollectionPage* _tmp16_;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = self->priv->collection_page;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = _tmp16_ != NULL;
-#line 2869 "Commands.c"
+#line 2853 "Commands.c"
 			} else {
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = FALSE;
-#line 2873 "Commands.c"
+#line 2857 "Commands.c"
 			}
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp14_) {
-#line 2877 "Commands.c"
+#line 2861 "Commands.c"
 				Photo* _tmp17_;
 				CollectionPage* _tmp18_;
 #line 33 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2884,7 +2868,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 				_tmp18_ = self->priv->collection_page;
 #line 34 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _page_command_on_controller_destroyed_gtk_widget_destroy, self, 0);
-#line 2888 "Commands.c"
+#line 2872 "Commands.c"
 			} else {
 #line 36 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (self->priv->library_photo);
@@ -2894,16 +2878,16 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 				_g_object_unref0 (self->priv->collection_page);
 #line 37 "/home/jens/Source/shotwell/src/Commands.vala"
 				self->priv->collection_page = NULL;
-#line 2898 "Commands.c"
+#line 2882 "Commands.c"
 			}
 		}
 #line 20 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (photo_page);
-#line 2903 "Commands.c"
+#line 2887 "Commands.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 2907 "Commands.c"
+#line 2891 "Commands.c"
 }
 
 
@@ -2915,7 +2899,7 @@ void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_retu
 	_tmp0_ = auto_return;
 #line 55 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->auto_return = _tmp0_;
-#line 2919 "Commands.c"
+#line 2903 "Commands.c"
 }
 
 
@@ -2930,11 +2914,11 @@ static void page_command_real_prepare (Command* base) {
 	if (_tmp0_) {
 #line 60 "/home/jens/Source/shotwell/src/Commands.vala"
 		page_command_return_to_page (self);
-#line 2934 "Commands.c"
+#line 2918 "Commands.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (page_command_parent_class)->prepare (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
-#line 2938 "Commands.c"
+#line 2922 "Commands.c"
 }
 
 
@@ -2955,28 +2939,28 @@ void page_command_return_to_page (PageCommand* self) {
 	_tmp2_ = photo_page;
 #line 68 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 2959 "Commands.c"
+#line 2943 "Commands.c"
 		gboolean _tmp3_ = FALSE;
 		Photo* _tmp4_;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->library_photo;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp4_ != NULL) {
-#line 2966 "Commands.c"
+#line 2950 "Commands.c"
 			CollectionPage* _tmp5_;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = self->priv->collection_page;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = _tmp5_ != NULL;
-#line 2972 "Commands.c"
+#line 2956 "Commands.c"
 		} else {
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = FALSE;
-#line 2976 "Commands.c"
+#line 2960 "Commands.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 2980 "Commands.c"
+#line 2964 "Commands.c"
 			gboolean photo_in_collection = FALSE;
 			gint count = 0;
 			CollectionPage* _tmp6_;
@@ -3001,19 +2985,19 @@ void page_command_return_to_page (PageCommand* self) {
 			_data_collection_unref0 (_tmp8_);
 #line 71 "/home/jens/Source/shotwell/src/Commands.vala"
 			count = _tmp10_;
-#line 3005 "Commands.c"
+#line 2989 "Commands.c"
 			{
 				gint i = 0;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 				i = 0;
-#line 3010 "Commands.c"
+#line 2994 "Commands.c"
 				{
 					gboolean _tmp11_ = FALSE;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp11_ = TRUE;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 3017 "Commands.c"
+#line 3001 "Commands.c"
 						gint _tmp13_;
 						gint _tmp14_;
 						CollectionPage* _tmp15_;
@@ -3028,13 +3012,13 @@ void page_command_return_to_page (PageCommand* self) {
 						gboolean _tmp24_;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (!_tmp11_) {
-#line 3032 "Commands.c"
+#line 3016 "Commands.c"
 							gint _tmp12_;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp12_ = i;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 							i = _tmp12_ + 1;
-#line 3038 "Commands.c"
+#line 3022 "Commands.c"
 						}
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp11_ = FALSE;
@@ -3046,7 +3030,7 @@ void page_command_return_to_page (PageCommand* self) {
 						if (!(_tmp13_ < _tmp14_)) {
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 3050 "Commands.c"
+#line 3034 "Commands.c"
 						}
 #line 73 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp15_ = self->priv->collection_page;
@@ -3080,7 +3064,7 @@ void page_command_return_to_page (PageCommand* self) {
 							photo_in_collection = TRUE;
 #line 75 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 3084 "Commands.c"
+#line 3068 "Commands.c"
 						}
 					}
 				}
@@ -3089,7 +3073,7 @@ void page_command_return_to_page (PageCommand* self) {
 			_tmp25_ = photo_in_collection;
 #line 79 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp25_) {
-#line 3093 "Commands.c"
+#line 3077 "Commands.c"
 				LibraryWindow* _tmp26_;
 				LibraryWindow* _tmp27_;
 				CollectionPage* _tmp28_;
@@ -3106,7 +3090,7 @@ void page_command_return_to_page (PageCommand* self) {
 				library_window_switch_to_photo_page (_tmp27_, _tmp28_, _tmp29_);
 #line 80 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp27_);
-#line 3110 "Commands.c"
+#line 3094 "Commands.c"
 			}
 		}
 	} else {
@@ -3115,7 +3099,7 @@ void page_command_return_to_page (PageCommand* self) {
 		_tmp30_ = self->priv->page;
 #line 82 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp30_ != NULL) {
-#line 3119 "Commands.c"
+#line 3103 "Commands.c"
 			AppWindow* _tmp31_;
 			AppWindow* _tmp32_;
 			Page* _tmp33_;
@@ -3129,12 +3113,12 @@ void page_command_return_to_page (PageCommand* self) {
 			page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PAGE_WINDOW, PageWindow), _tmp33_);
 #line 83 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp32_);
-#line 3133 "Commands.c"
+#line 3117 "Commands.c"
 		}
 	}
 #line 65 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo_page);
-#line 3138 "Commands.c"
+#line 3122 "Commands.c"
 }
 
 
@@ -3153,7 +3137,7 @@ static void page_command_on_page_destroyed (PageCommand* self) {
 	_g_object_unref0 (self->priv->page);
 #line 88 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->page = NULL;
-#line 3157 "Commands.c"
+#line 3141 "Commands.c"
 }
 
 
@@ -3172,7 +3156,7 @@ static void page_command_on_photo_destroyed (PageCommand* self) {
 	_g_object_unref0 (self->priv->library_photo);
 #line 93 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->library_photo = NULL;
-#line 3176 "Commands.c"
+#line 3160 "Commands.c"
 }
 
 
@@ -3191,7 +3175,7 @@ static void page_command_on_controller_destroyed (PageCommand* self) {
 	_g_object_unref0 (self->priv->collection_page);
 #line 98 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->collection_page = NULL;
-#line 3195 "Commands.c"
+#line 3179 "Commands.c"
 }
 
 
@@ -3204,7 +3188,7 @@ static void page_command_class_init (PageCommandClass * klass) {
 	((CommandClass *) klass)->prepare = (void (*) (Command *)) page_command_real_prepare;
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_command_finalize;
-#line 3208 "Commands.c"
+#line 3192 "Commands.c"
 }
 
 
@@ -3217,7 +3201,7 @@ static void page_command_instance_init (PageCommand * self) {
 	self->priv->library_photo = NULL;
 #line 13 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->collection_page = NULL;
-#line 3221 "Commands.c"
+#line 3205 "Commands.c"
 }
 
 
@@ -3232,7 +3216,7 @@ static void page_command_finalize (GObject * obj) {
 	_tmp0_ = self->priv->page;
 #line 44 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ != NULL) {
-#line 3236 "Commands.c"
+#line 3220 "Commands.c"
 		Page* _tmp1_;
 		guint _tmp2_;
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3241,13 +3225,13 @@ static void page_command_finalize (GObject * obj) {
 		g_signal_parse_name ("destroy", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _page_command_on_page_destroyed_gtk_widget_destroy, self);
-#line 3245 "Commands.c"
+#line 3229 "Commands.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = self->priv->library_photo;
 #line 47 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 3251 "Commands.c"
+#line 3235 "Commands.c"
 		Photo* _tmp4_;
 		guint _tmp5_;
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3256,13 +3240,13 @@ static void page_command_finalize (GObject * obj) {
 		g_signal_parse_name ("destroyed", TYPE_DATA_SOURCE, &_tmp5_, NULL, FALSE);
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_command_on_photo_destroyed_data_source_destroyed, self);
-#line 3260 "Commands.c"
+#line 3244 "Commands.c"
 	}
 #line 50 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = self->priv->collection_page;
 #line 50 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 3266 "Commands.c"
+#line 3250 "Commands.c"
 		CollectionPage* _tmp7_;
 		guint _tmp8_;
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3271,7 +3255,7 @@ static void page_command_finalize (GObject * obj) {
 		g_signal_parse_name ("destroy", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _page_command_on_controller_destroyed_gtk_widget_destroy, self);
-#line 3275 "Commands.c"
+#line 3259 "Commands.c"
 	}
 #line 10 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->page);
@@ -3281,7 +3265,7 @@ static void page_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->collection_page);
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (page_command_parent_class)->finalize (obj);
-#line 3285 "Commands.c"
+#line 3269 "Commands.c"
 }
 
 
@@ -3300,7 +3284,7 @@ GType page_command_get_type (void) {
 static void _single_data_source_command_on_source_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) {
 #line 115 "/home/jens/Source/shotwell/src/Commands.vala"
 	single_data_source_command_on_source_destroyed ((SingleDataSourceCommand*) self);
-#line 3304 "Commands.c"
+#line 3288 "Commands.c"
 }
 
 
@@ -3337,7 +3321,7 @@ SingleDataSourceCommand* single_data_source_command_construct (GType object_type
 	g_signal_connect_object (_tmp4_, "destroyed", (GCallback) _single_data_source_command_on_source_destroyed_data_source_destroyed, self, 0);
 #line 106 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3341 "Commands.c"
+#line 3325 "Commands.c"
 }
 
 
@@ -3355,7 +3339,7 @@ DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self
 	result = _tmp1_;
 #line 119 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 3359 "Commands.c"
+#line 3343 "Commands.c"
 }
 
 
@@ -3372,7 +3356,7 @@ static void single_data_source_command_on_source_destroyed (SingleDataSourceComm
 	command_manager_reset (_tmp1_);
 #line 125 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 3376 "Commands.c"
+#line 3360 "Commands.c"
 }
 
 
@@ -3381,7 +3365,7 @@ static void single_data_source_command_class_init (SingleDataSourceCommandClass
 	single_data_source_command_parent_class = g_type_class_peek_parent (klass);
 #line 103 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_data_source_command_finalize;
-#line 3385 "Commands.c"
+#line 3369 "Commands.c"
 }
 
 
@@ -3405,7 +3389,7 @@ static void single_data_source_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->source);
 #line 103 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (single_data_source_command_parent_class)->finalize (obj);
-#line 3409 "Commands.c"
+#line 3393 "Commands.c"
 }
 
 
@@ -3424,7 +3408,7 @@ GType single_data_source_command_get_type (void) {
 static void _simple_proxyable_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 141 "/home/jens/Source/shotwell/src/Commands.vala"
 	simple_proxyable_command_on_proxy_broken ((SimpleProxyableCommand*) self);
-#line 3428 "Commands.c"
+#line 3412 "Commands.c"
 }
 
 
@@ -3461,7 +3445,7 @@ SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, P
 	g_signal_connect_object (_tmp4_, "broken", (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self, 0);
 #line 133 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3465 "Commands.c"
+#line 3449 "Commands.c"
 }
 
 
@@ -3482,7 +3466,7 @@ static void simple_proxyable_command_real_execute (Command* base) {
 	simple_proxyable_command_execute_on_source (self, _tmp2_);
 #line 146 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp2_);
-#line 3486 "Commands.c"
+#line 3470 "Commands.c"
 }
 
 
@@ -3491,7 +3475,7 @@ static void simple_proxyable_command_real_execute_on_source (SimpleProxyableComm
 	g_critical ("Type `%s' does not implement abstract method `simple_proxyable_command_execute_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 149 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 3495 "Commands.c"
+#line 3479 "Commands.c"
 }
 
 
@@ -3500,7 +3484,7 @@ void simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, D
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 149 "/home/jens/Source/shotwell/src/Commands.vala"
 	SIMPLE_PROXYABLE_COMMAND_GET_CLASS (self)->execute_on_source (self, source);
-#line 3504 "Commands.c"
+#line 3488 "Commands.c"
 }
 
 
@@ -3521,7 +3505,7 @@ static void simple_proxyable_command_real_undo (Command* base) {
 	simple_proxyable_command_undo_on_source (self, _tmp2_);
 #line 152 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp2_);
-#line 3525 "Commands.c"
+#line 3509 "Commands.c"
 }
 
 
@@ -3530,7 +3514,7 @@ static void simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand
 	g_critical ("Type `%s' does not implement abstract method `simple_proxyable_command_undo_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 155 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 3534 "Commands.c"
+#line 3518 "Commands.c"
 }
 
 
@@ -3539,7 +3523,7 @@ void simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, Data
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 155 "/home/jens/Source/shotwell/src/Commands.vala"
 	SIMPLE_PROXYABLE_COMMAND_GET_CLASS (self)->undo_on_source (self, source);
-#line 3543 "Commands.c"
+#line 3527 "Commands.c"
 }
 
 
@@ -3548,7 +3532,7 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 161 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (proxyables));
-#line 3552 "Commands.c"
+#line 3536 "Commands.c"
 	{
 		GeeIterator* _proxyable_it = NULL;
 		GeeCollection* _tmp0_;
@@ -3561,7 +3545,7 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 		_proxyable_it = _tmp1_;
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 3565 "Commands.c"
+#line 3549 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			Proxyable* proxyable = NULL;
@@ -3581,7 +3565,7 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 			if (!_tmp3_) {
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 3585 "Commands.c"
+#line 3569 "Commands.c"
 			}
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _proxyable_it;
@@ -3609,11 +3593,11 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 			_source_proxy_unref0 (added_proxy);
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (proxyable);
-#line 3613 "Commands.c"
+#line 3597 "Commands.c"
 		}
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxyable_it);
-#line 3617 "Commands.c"
+#line 3601 "Commands.c"
 	}
 }
 
@@ -3622,7 +3606,7 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 	GeeHashSet* _tmp8_;
 #line 170 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
-#line 3626 "Commands.c"
+#line 3610 "Commands.c"
 	{
 		GeeIterator* _added_proxy_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -3635,7 +3619,7 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 		_added_proxy_it = _tmp1_;
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 3639 "Commands.c"
+#line 3623 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceProxy* added_proxy = NULL;
@@ -3651,7 +3635,7 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 			if (!_tmp3_) {
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 3655 "Commands.c"
+#line 3639 "Commands.c"
 			}
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _added_proxy_it;
@@ -3667,17 +3651,17 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self);
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (added_proxy);
-#line 3671 "Commands.c"
+#line 3655 "Commands.c"
 		}
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_added_proxy_it);
-#line 3675 "Commands.c"
+#line 3659 "Commands.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = self->priv->proxies;
 #line 174 "/home/jens/Source/shotwell/src/Commands.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 3681 "Commands.c"
+#line 3665 "Commands.c"
 }
 
 
@@ -3696,7 +3680,7 @@ static void simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* se
 	command_manager_reset (_tmp1_);
 #line 179 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 3700 "Commands.c"
+#line 3684 "Commands.c"
 }
 
 
@@ -3715,7 +3699,7 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) simple_proxyable_command_real_undo_on_source;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_proxyable_command_finalize;
-#line 3719 "Commands.c"
+#line 3703 "Commands.c"
 }
 
 
@@ -3727,7 +3711,7 @@ static void simple_proxyable_command_instance_init (SimpleProxyableCommand * sel
 	_tmp0_ = gee_hash_set_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 131 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->proxies = _tmp0_;
-#line 3731 "Commands.c"
+#line 3715 "Commands.c"
 }
 
 
@@ -3751,7 +3735,7 @@ static void simple_proxyable_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->proxies);
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (simple_proxyable_command_parent_class)->finalize (obj);
-#line 3755 "Commands.c"
+#line 3739 "Commands.c"
 }
 
 
@@ -3770,7 +3754,7 @@ GType simple_proxyable_command_get_type (void) {
 static void _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) {
 #line 194 "/home/jens/Source/shotwell/src/Commands.vala"
 	single_photo_transformation_command_on_state_broken ((SinglePhotoTransformationCommand*) self);
-#line 3774 "Commands.c"
+#line 3758 "Commands.c"
 }
 
 
@@ -3810,7 +3794,7 @@ SinglePhotoTransformationCommand* single_photo_transformation_command_construct
 	g_signal_connect_object (_tmp5_, "broken", (GCallback) _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0);
 #line 186 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3814 "Commands.c"
+#line 3798 "Commands.c"
 }
 
 
@@ -3826,7 +3810,7 @@ static void single_photo_transformation_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->state;
 #line 198 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 3830 "Commands.c"
+#line 3814 "Commands.c"
 }
 
 
@@ -3843,7 +3827,7 @@ static void single_photo_transformation_command_on_state_broken (SinglePhotoTran
 	command_manager_reset (_tmp1_);
 #line 202 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 3847 "Commands.c"
+#line 3831 "Commands.c"
 }
 
 
@@ -3856,14 +3840,14 @@ static void single_photo_transformation_command_class_init (SinglePhotoTransform
 	((CommandClass *) klass)->undo = (void (*) (Command *)) single_photo_transformation_command_real_undo;
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_transformation_command_finalize;
-#line 3860 "Commands.c"
+#line 3844 "Commands.c"
 }
 
 
 static void single_photo_transformation_command_instance_init (SinglePhotoTransformationCommand * self) {
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SINGLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self);
-#line 3867 "Commands.c"
+#line 3851 "Commands.c"
 }
 
 
@@ -3883,7 +3867,7 @@ static void single_photo_transformation_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->state);
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (single_photo_transformation_command_parent_class)->finalize (obj);
-#line 3887 "Commands.c"
+#line 3871 "Commands.c"
 }
 
 
@@ -3902,7 +3886,7 @@ GType single_photo_transformation_command_get_type (void) {
 static void _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) {
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
 	generic_photo_transformation_command_on_state_broken ((GenericPhotoTransformationCommand*) self);
-#line 3906 "Commands.c"
+#line 3890 "Commands.c"
 }
 
 
@@ -3927,7 +3911,7 @@ GenericPhotoTransformationCommand* generic_photo_transformation_command_construc
 	self = (GenericPhotoTransformationCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), _tmp1_, _tmp2_);
 #line 210 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3931 "Commands.c"
+#line 3915 "Commands.c"
 }
 
 
@@ -3972,7 +3956,7 @@ static void generic_photo_transformation_command_real_execute (Command* base) {
 	g_signal_connect_object (_tmp5_, "broken", (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0);
 #line 222 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 3976 "Commands.c"
+#line 3960 "Commands.c"
 }
 
 
@@ -3981,7 +3965,7 @@ static void generic_photo_transformation_command_real_execute_on_photo (GenericP
 	g_critical ("Type `%s' does not implement abstract method `generic_photo_transformation_command_execute_on_photo'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 234 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 3985 "Commands.c"
+#line 3969 "Commands.c"
 }
 
 
@@ -3990,7 +3974,7 @@ void generic_photo_transformation_command_execute_on_photo (GenericPhotoTransfor
 	g_return_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self));
 #line 234 "/home/jens/Source/shotwell/src/Commands.vala"
 	GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_CLASS (self)->execute_on_photo (self, photo);
-#line 3994 "Commands.c"
+#line 3978 "Commands.c"
 }
 
 
@@ -4006,7 +3990,7 @@ static void generic_photo_transformation_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->original_state;
 #line 238 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 4010 "Commands.c"
+#line 3994 "Commands.c"
 }
 
 
@@ -4022,7 +4006,7 @@ static void generic_photo_transformation_command_real_redo (Command* base) {
 	_tmp1_ = self->priv->transformed_state;
 #line 243 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 4026 "Commands.c"
+#line 4010 "Commands.c"
 }
 
 
@@ -4034,7 +4018,7 @@ static gboolean generic_photo_transformation_command_real_can_compress (GenericP
 	result = FALSE;
 #line 247 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4038 "Commands.c"
+#line 4022 "Commands.c"
 }
 
 
@@ -4043,7 +4027,7 @@ gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransfor
 	g_return_val_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self), FALSE);
 #line 246 "/home/jens/Source/shotwell/src/Commands.vala"
 	return GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_CLASS (self)->can_compress (self, command);
-#line 4047 "Commands.c"
+#line 4031 "Commands.c"
 }
 
 
@@ -4077,7 +4061,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 		result = FALSE;
 #line 252 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 4081 "Commands.c"
+#line 4065 "Commands.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = command;
@@ -4095,7 +4079,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 		_g_object_unref0 (generic);
 #line 256 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 4099 "Commands.c"
+#line 4083 "Commands.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = generic;
@@ -4111,7 +4095,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 		_g_object_unref0 (generic);
 #line 259 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 4115 "Commands.c"
+#line 4099 "Commands.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = generic;
@@ -4133,7 +4117,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 	_g_object_unref0 (generic);
 #line 267 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4137 "Commands.c"
+#line 4121 "Commands.c"
 }
 
 
@@ -4150,7 +4134,7 @@ static void generic_photo_transformation_command_on_state_broken (GenericPhotoTr
 	command_manager_reset (_tmp1_);
 #line 271 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 4154 "Commands.c"
+#line 4138 "Commands.c"
 }
 
 
@@ -4173,7 +4157,7 @@ static void generic_photo_transformation_command_class_init (GenericPhotoTransfo
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) generic_photo_transformation_command_real_compress;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = generic_photo_transformation_command_finalize;
-#line 4177 "Commands.c"
+#line 4161 "Commands.c"
 }
 
 
@@ -4184,7 +4168,7 @@ static void generic_photo_transformation_command_instance_init (GenericPhotoTran
 	self->priv->original_state = NULL;
 #line 208 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->transformed_state = NULL;
-#line 4188 "Commands.c"
+#line 4172 "Commands.c"
 }
 
 
@@ -4198,7 +4182,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 	_tmp0_ = self->priv->original_state;
 #line 215 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ != NULL) {
-#line 4202 "Commands.c"
+#line 4186 "Commands.c"
 		PhotoTransformationState* _tmp1_;
 		guint _tmp2_;
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4207,13 +4191,13 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 		g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp2_, NULL, FALSE);
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self);
-#line 4211 "Commands.c"
+#line 4195 "Commands.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = self->priv->transformed_state;
 #line 218 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 4217 "Commands.c"
+#line 4201 "Commands.c"
 		PhotoTransformationState* _tmp4_;
 		guint _tmp5_;
 #line 219 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4222,7 +4206,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 		g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp5_, NULL, FALSE);
 #line 219 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self);
-#line 4226 "Commands.c"
+#line 4210 "Commands.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->original_state);
@@ -4230,7 +4214,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->transformed_state);
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (generic_photo_transformation_command_parent_class)->finalize (obj);
-#line 4234 "Commands.c"
+#line 4218 "Commands.c"
 }
 
 
@@ -4249,7 +4233,7 @@ GType generic_photo_transformation_command_get_type (void) {
 static void _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 309 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_data_source_command_on_source_destroyed ((MultipleDataSourceCommand*) self, source);
-#line 4253 "Commands.c"
+#line 4237 "Commands.c"
 }
 
 
@@ -4293,7 +4277,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 	_g_free0 (self->priv->undo_progress_text);
 #line 290 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->undo_progress_text = _tmp5_;
-#line 4297 "Commands.c"
+#line 4281 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp6_;
@@ -4306,7 +4290,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 		_view_it = _tmp7_;
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4310 "Commands.c"
+#line 4294 "Commands.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			DataView* view = NULL;
@@ -4329,7 +4313,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			if (!_tmp9_) {
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4333 "Commands.c"
+#line 4317 "Commands.c"
 			}
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = _view_it;
@@ -4353,7 +4337,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			_tmp16_ = collection;
 #line 296 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 4357 "Commands.c"
+#line 4341 "Commands.c"
 				GeeHashSet* _tmp17_;
 				SourceCollection* _tmp18_;
 #line 297 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4362,7 +4346,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 				_tmp18_ = collection;
 #line 297 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
-#line 4366 "Commands.c"
+#line 4350 "Commands.c"
 			}
 #line 299 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp19_ = self->source_list;
@@ -4376,11 +4360,11 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			_g_object_unref0 (source);
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 4380 "Commands.c"
+#line 4364 "Commands.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 4384 "Commands.c"
+#line 4368 "Commands.c"
 	}
 	{
 		GeeIterator* _current_collection_it = NULL;
@@ -4394,7 +4378,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 		_current_collection_it = _tmp22_;
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4398 "Commands.c"
+#line 4382 "Commands.c"
 			GeeIterator* _tmp23_;
 			gboolean _tmp24_;
 			SourceCollection* current_collection = NULL;
@@ -4409,7 +4393,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			if (!_tmp24_) {
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4413 "Commands.c"
+#line 4397 "Commands.c"
 			}
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _current_collection_it;
@@ -4423,15 +4407,15 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			g_signal_connect_object (_tmp27_, "item-destroyed", (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self, 0);
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (current_collection);
-#line 4427 "Commands.c"
+#line 4411 "Commands.c"
 		}
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 4431 "Commands.c"
+#line 4415 "Commands.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 4435 "Commands.c"
+#line 4419 "Commands.c"
 }
 
 
@@ -4449,7 +4433,7 @@ GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand
 	result = _tmp1_;
 #line 314 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4453 "Commands.c"
+#line 4437 "Commands.c"
 }
 
 
@@ -4470,7 +4454,7 @@ gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* s
 	result = _tmp2_;
 #line 318 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4474 "Commands.c"
+#line 4458 "Commands.c"
 }
 
 
@@ -4490,7 +4474,7 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 324 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_) {
-#line 4494 "Commands.c"
+#line 4478 "Commands.c"
 		CommandManager* _tmp3_;
 		CommandManager* _tmp4_;
 #line 325 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4501,7 +4485,7 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
 		command_manager_reset (_tmp4_);
 #line 325 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp4_);
-#line 4505 "Commands.c"
+#line 4489 "Commands.c"
 	}
 }
 
@@ -4527,7 +4511,7 @@ static void multiple_data_source_command_real_execute (Command* base) {
 	multiple_data_source_command_execute_all (self, TRUE, TRUE, _tmp1_, _tmp2_);
 #line 333 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_data_source_command_commit_transaction (self);
-#line 4531 "Commands.c"
+#line 4515 "Commands.c"
 }
 
 
@@ -4536,7 +4520,7 @@ static void multiple_data_source_command_real_execute_on_source (MultipleDataSou
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_command_execute_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 336 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 4540 "Commands.c"
+#line 4524 "Commands.c"
 }
 
 
@@ -4545,7 +4529,7 @@ void multiple_data_source_command_execute_on_source (MultipleDataSourceCommand*
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
 #line 336 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_COMMAND_GET_CLASS (self)->execute_on_source (self, source);
-#line 4549 "Commands.c"
+#line 4533 "Commands.c"
 }
 
 
@@ -4564,7 +4548,7 @@ static void multiple_data_source_command_real_undo (Command* base) {
 	_tmp2_ = _tmp1_;
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ > 0) {
-#line 4568 "Commands.c"
+#line 4552 "Commands.c"
 		GeeArrayList* _tmp3_;
 		GeeArrayList* _tmp4_;
 #line 340 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4579,7 +4563,7 @@ static void multiple_data_source_command_real_undo (Command* base) {
 		_tmp4_ = self->priv->acted_upon;
 #line 344 "/home/jens/Source/shotwell/src/Commands.vala"
 		gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 4583 "Commands.c"
+#line 4567 "Commands.c"
 	}
 }
 
@@ -4589,7 +4573,7 @@ static void multiple_data_source_command_real_undo_on_source (MultipleDataSource
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_command_undo_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 348 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 4593 "Commands.c"
+#line 4577 "Commands.c"
 }
 
 
@@ -4598,21 +4582,21 @@ void multiple_data_source_command_undo_on_source (MultipleDataSourceCommand* sel
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
 #line 348 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_COMMAND_GET_CLASS (self)->undo_on_source (self, source);
-#line 4602 "Commands.c"
+#line 4586 "Commands.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 352 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 4609 "Commands.c"
+#line 4593 "Commands.c"
 }
 
 
 static void multiple_data_source_command_start_transaction (MultipleDataSourceCommand* self) {
 #line 350 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
-#line 4616 "Commands.c"
+#line 4600 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -4625,7 +4609,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 		_sources_it = _tmp1_;
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4629 "Commands.c"
+#line 4613 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* sources = NULL;
@@ -4643,7 +4627,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 			if (!_tmp3_) {
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4647 "Commands.c"
+#line 4631 "Commands.c"
 			}
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _sources_it;
@@ -4661,7 +4645,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 			_tmp8_ = media_collection;
 #line 353 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ != NULL) {
-#line 4665 "Commands.c"
+#line 4649 "Commands.c"
 				MediaSourceCollection* _tmp9_;
 				TransactionController* _tmp10_;
 				TransactionController* _tmp11_;
@@ -4673,17 +4657,17 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 				_tmp11_ = _tmp10_;
 #line 354 "/home/jens/Source/shotwell/src/Commands.vala"
 				transaction_controller_begin (_tmp11_);
-#line 4677 "Commands.c"
+#line 4661 "Commands.c"
 			}
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (media_collection);
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (sources);
-#line 4683 "Commands.c"
+#line 4667 "Commands.c"
 		}
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_sources_it);
-#line 4687 "Commands.c"
+#line 4671 "Commands.c"
 	}
 }
 
@@ -4691,7 +4675,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 static void multiple_data_source_command_commit_transaction (MultipleDataSourceCommand* self) {
 #line 358 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
-#line 4695 "Commands.c"
+#line 4679 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -4704,7 +4688,7 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 		_sources_it = _tmp1_;
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4708 "Commands.c"
+#line 4692 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* sources = NULL;
@@ -4722,7 +4706,7 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 			if (!_tmp3_) {
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4726 "Commands.c"
+#line 4710 "Commands.c"
 			}
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _sources_it;
@@ -4740,7 +4724,7 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 			_tmp8_ = media_collection;
 #line 361 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ != NULL) {
-#line 4744 "Commands.c"
+#line 4728 "Commands.c"
 				MediaSourceCollection* _tmp9_;
 				TransactionController* _tmp10_;
 				TransactionController* _tmp11_;
@@ -4752,17 +4736,17 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 				_tmp11_ = _tmp10_;
 #line 362 "/home/jens/Source/shotwell/src/Commands.vala"
 				transaction_controller_commit (_tmp11_);
-#line 4756 "Commands.c"
+#line 4740 "Commands.c"
 			}
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (media_collection);
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (sources);
-#line 4762 "Commands.c"
+#line 4746 "Commands.c"
 		}
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_sources_it);
-#line 4766 "Commands.c"
+#line 4750 "Commands.c"
 	}
 }
 
@@ -4822,26 +4806,26 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	if (_tmp6_ <= 0) {
 #line 374 "/home/jens/Source/shotwell/src/Commands.vala"
 		two_percent = 1;
-#line 4826 "Commands.c"
+#line 4810 "Commands.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = exec;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_) {
-#line 4832 "Commands.c"
+#line 4816 "Commands.c"
 		const gchar* _tmp9_;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = self->priv->progress_text;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp9_;
-#line 4838 "Commands.c"
+#line 4822 "Commands.c"
 	} else {
 		const gchar* _tmp10_;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = self->priv->undo_progress_text;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp10_;
-#line 4845 "Commands.c"
+#line 4829 "Commands.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = g_strdup (_tmp7_);
@@ -4855,7 +4839,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	_tmp12_ = total;
 #line 380 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp12_ >= MULTIPLE_DATA_SOURCE_COMMAND_MIN_OPS_FOR_PROGRESS_WINDOW) {
-#line 4859 "Commands.c"
+#line 4843 "Commands.c"
 		GCancellable* _tmp13_ = NULL;
 		gboolean _tmp14_;
 		GCancellable* _tmp16_;
@@ -4868,7 +4852,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 		_tmp14_ = can_cancel;
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp14_) {
-#line 4872 "Commands.c"
+#line 4856 "Commands.c"
 			GCancellable* _tmp15_;
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = g_cancellable_new ();
@@ -4876,13 +4860,13 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 			_g_object_unref0 (_tmp13_);
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _tmp15_;
-#line 4880 "Commands.c"
+#line 4864 "Commands.c"
 		} else {
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp13_);
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = NULL;
-#line 4886 "Commands.c"
+#line 4870 "Commands.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp16_ = _g_object_ref0 (_tmp13_);
@@ -4910,7 +4894,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 		_g_object_unref0 (_tmp18_);
 #line 380 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp13_);
-#line 4914 "Commands.c"
+#line 4898 "Commands.c"
 	}
 	{
 		GeeArrayList* _source_list = NULL;
@@ -4939,7 +4923,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 		_source_index = -1;
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4943 "Commands.c"
+#line 4927 "Commands.c"
 			gint _tmp27_;
 			gint _tmp28_;
 			gint _tmp29_;
@@ -4962,7 +4946,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 			if (!(_tmp28_ < _tmp29_)) {
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4966 "Commands.c"
+#line 4950 "Commands.c"
 			}
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp30_ = _source_list;
@@ -4976,26 +4960,26 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 			_tmp33_ = exec;
 #line 386 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp33_) {
-#line 4980 "Commands.c"
+#line 4964 "Commands.c"
 				DataSource* _tmp34_;
 #line 387 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp34_ = source;
 #line 387 "/home/jens/Source/shotwell/src/Commands.vala"
 				multiple_data_source_command_execute_on_source (self, _tmp34_);
-#line 4986 "Commands.c"
+#line 4970 "Commands.c"
 			} else {
 				DataSource* _tmp35_;
 #line 389 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp35_ = source;
 #line 389 "/home/jens/Source/shotwell/src/Commands.vala"
 				multiple_data_source_command_undo_on_source (self, _tmp35_);
-#line 4993 "Commands.c"
+#line 4977 "Commands.c"
 			}
 #line 391 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp36_ = completed;
 #line 391 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp36_ != NULL) {
-#line 4999 "Commands.c"
+#line 4983 "Commands.c"
 				GeeArrayList* _tmp37_;
 				DataSource* _tmp38_;
 #line 392 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5004,13 +4988,13 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 				_tmp38_ = source;
 #line 392 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
-#line 5008 "Commands.c"
+#line 4992 "Commands.c"
 			}
 #line 394 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp39_ = progress;
 #line 394 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp39_ != NULL) {
-#line 5014 "Commands.c"
+#line 4998 "Commands.c"
 				gint _tmp40_;
 				gint _tmp41_;
 				gint _tmp42_;
@@ -5026,7 +5010,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 				_tmp42_ = two_percent;
 #line 395 "/home/jens/Source/shotwell/src/Commands.vala"
 				if ((_tmp41_ % _tmp42_) == 0) {
-#line 5030 "Commands.c"
+#line 5014 "Commands.c"
 					ProgressDialog* _tmp43_;
 					gint _tmp44_;
 					gint _tmp45_;
@@ -5040,13 +5024,13 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 					progress_dialog_set_fraction (_tmp43_, _tmp44_, _tmp45_);
 #line 397 "/home/jens/Source/shotwell/src/Commands.vala"
 					spin_event_loop ();
-#line 5044 "Commands.c"
+#line 5028 "Commands.c"
 				}
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp47_ = cancellable;
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp47_ != NULL) {
-#line 5050 "Commands.c"
+#line 5034 "Commands.c"
 					GCancellable* _tmp48_;
 					gboolean _tmp49_;
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5055,11 +5039,11 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 					_tmp49_ = g_cancellable_is_cancelled (_tmp48_);
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp46_ = _tmp49_;
-#line 5059 "Commands.c"
+#line 5043 "Commands.c"
 				} else {
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp46_ = FALSE;
-#line 5063 "Commands.c"
+#line 5047 "Commands.c"
 				}
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp46_) {
@@ -5067,28 +5051,28 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 					_g_object_unref0 (source);
 #line 401 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 5071 "Commands.c"
+#line 5055 "Commands.c"
 				}
 			}
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5076 "Commands.c"
+#line 5060 "Commands.c"
 		}
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_list);
-#line 5080 "Commands.c"
+#line 5064 "Commands.c"
 	}
 #line 405 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp50_ = progress;
 #line 405 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp50_ != NULL) {
-#line 5086 "Commands.c"
+#line 5070 "Commands.c"
 		ProgressDialog* _tmp51_;
 #line 406 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp51_ = progress;
 #line 406 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp51_);
-#line 5092 "Commands.c"
+#line 5076 "Commands.c"
 	}
 #line 408 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp52_ = app_window_get_instance ();
@@ -5104,7 +5088,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	_g_object_unref0 (cancellable);
 #line 366 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (text);
-#line 5108 "Commands.c"
+#line 5092 "Commands.c"
 }
 
 
@@ -5123,7 +5107,7 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_data_source_command_real_undo_on_source;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_data_source_command_finalize;
-#line 5127 "Commands.c"
+#line 5111 "Commands.c"
 }
 
 
@@ -5145,7 +5129,7 @@ static void multiple_data_source_command_instance_init (MultipleDataSourceComman
 	_tmp2_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 283 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->hooked_collections = _tmp2_;
-#line 5149 "Commands.c"
+#line 5133 "Commands.c"
 }
 
 
@@ -5153,7 +5137,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 	MultipleDataSourceCommand * self;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
-#line 5157 "Commands.c"
+#line 5141 "Commands.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -5166,7 +5150,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 		_current_collection_it = _tmp1_;
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5170 "Commands.c"
+#line 5154 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* current_collection = NULL;
@@ -5182,7 +5166,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 			if (!_tmp3_) {
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5186 "Commands.c"
+#line 5170 "Commands.c"
 			}
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _current_collection_it;
@@ -5198,11 +5182,11 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self);
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (current_collection);
-#line 5202 "Commands.c"
+#line 5186 "Commands.c"
 		}
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 5206 "Commands.c"
+#line 5190 "Commands.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->source_list);
@@ -5216,7 +5200,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->hooked_collections);
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (multiple_data_source_command_parent_class)->finalize (obj);
-#line 5220 "Commands.c"
+#line 5204 "Commands.c"
 }
 
 
@@ -5235,7 +5219,7 @@ GType multiple_data_source_command_get_type (void) {
 static void _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) {
 #line 435 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_data_source_at_once_command_on_sources_destroyed ((MultipleDataSourceAtOnceCommand*) self, destroyed);
-#line 5239 "Commands.c"
+#line 5223 "Commands.c"
 }
 
 
@@ -5263,7 +5247,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 	_tmp3_ = sources;
 #line 421 "/home/jens/Source/shotwell/src/Commands.vala"
 	gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
-#line 5267 "Commands.c"
+#line 5251 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeHashSet* _tmp4_;
@@ -5276,7 +5260,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 		_source_it = _tmp5_;
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5280 "Commands.c"
+#line 5264 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataSource* source = NULL;
@@ -5295,7 +5279,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			if (!_tmp7_) {
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5299 "Commands.c"
+#line 5283 "Commands.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _source_it;
@@ -5313,7 +5297,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			if (_tmp12_ == NULL) {
 #line 424 "/home/jens/Source/shotwell/src/Commands.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 5317 "Commands.c"
+#line 5301 "Commands.c"
 			}
 #line 424 "/home/jens/Source/shotwell/src/Commands.vala"
 			membership = _tmp12_;
@@ -5321,7 +5305,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			_tmp13_ = membership;
 #line 425 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp13_ != NULL) {
-#line 5325 "Commands.c"
+#line 5309 "Commands.c"
 				GeeHashSet* _tmp14_;
 				SourceCollection* _tmp15_;
 #line 426 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5330,17 +5314,17 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 				_tmp15_ = membership;
 #line 426 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
-#line 5334 "Commands.c"
+#line 5318 "Commands.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (membership);
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5340 "Commands.c"
+#line 5324 "Commands.c"
 		}
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 5344 "Commands.c"
+#line 5328 "Commands.c"
 	}
 	{
 		GeeIterator* _source_collection_it = NULL;
@@ -5354,7 +5338,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 		_source_collection_it = _tmp17_;
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5358 "Commands.c"
+#line 5342 "Commands.c"
 			GeeIterator* _tmp18_;
 			gboolean _tmp19_;
 			SourceCollection* source_collection = NULL;
@@ -5369,7 +5353,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			if (!_tmp19_) {
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5373 "Commands.c"
+#line 5357 "Commands.c"
 			}
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp20_ = _source_collection_it;
@@ -5383,15 +5367,15 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			g_signal_connect_object (_tmp22_, "items-destroyed", (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self, 0);
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (source_collection);
-#line 5387 "Commands.c"
+#line 5371 "Commands.c"
 		}
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_collection_it);
-#line 5391 "Commands.c"
+#line 5375 "Commands.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 5395 "Commands.c"
+#line 5379 "Commands.c"
 }
 
 
@@ -5437,7 +5421,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 	media_collection_registry_thaw_all (_tmp6_);
 #line 446 "/home/jens/Source/shotwell/src/Commands.vala"
 	_media_collection_registry_unref0 (_tmp6_);
-#line 5441 "Commands.c"
+#line 5425 "Commands.c"
 	{
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 		database_table_commit_transaction (&_inner_error_);
@@ -5445,8 +5429,8 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5449 "Commands.c"
-				goto __catch456_database_error;
+#line 5433 "Commands.c"
+				goto __catch464_database_error;
 			}
 			{
 				AppWindow* _tmp7_;
@@ -5459,7 +5443,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp8_);
-#line 5463 "Commands.c"
+#line 5447 "Commands.c"
 			}
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5467,11 +5451,11 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 			g_clear_error (&_inner_error_);
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 5471 "Commands.c"
+#line 5455 "Commands.c"
 		}
 	}
-	goto __finally456;
-	__catch456_database_error:
+	goto __finally464;
+	__catch464_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -5485,9 +5469,9 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		app_window_database_error (_tmp9_);
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_error_free0 (err);
-#line 5489 "Commands.c"
+#line 5473 "Commands.c"
 	}
-	__finally456:
+	__finally464:
 	{
 		AppWindow* _tmp10_;
 		AppWindow* _tmp11_;
@@ -5499,7 +5483,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5503 "Commands.c"
+#line 5487 "Commands.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5509,7 +5493,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		g_clear_error (&_inner_error_);
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 5513 "Commands.c"
+#line 5497 "Commands.c"
 	}
 }
 
@@ -5519,7 +5503,7 @@ static void multiple_data_source_at_once_command_real_execute_on_all (MultipleDa
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_at_once_command_execute_on_all'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 456 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 5523 "Commands.c"
+#line 5507 "Commands.c"
 }
 
 
@@ -5528,7 +5512,7 @@ void multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOn
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self));
 #line 456 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_CLASS (self)->execute_on_all (self, sources);
-#line 5532 "Commands.c"
+#line 5516 "Commands.c"
 }
 
 
@@ -5574,7 +5558,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 	media_collection_registry_thaw_all (_tmp6_);
 #line 466 "/home/jens/Source/shotwell/src/Commands.vala"
 	_media_collection_registry_unref0 (_tmp6_);
-#line 5578 "Commands.c"
+#line 5562 "Commands.c"
 	{
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 		database_table_commit_transaction (&_inner_error_);
@@ -5582,8 +5566,8 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5586 "Commands.c"
-				goto __catch457_database_error;
+#line 5570 "Commands.c"
+				goto __catch465_database_error;
 			}
 			{
 				AppWindow* _tmp7_;
@@ -5596,7 +5580,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp8_);
-#line 5600 "Commands.c"
+#line 5584 "Commands.c"
 			}
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5604,11 +5588,11 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 			g_clear_error (&_inner_error_);
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 5608 "Commands.c"
+#line 5592 "Commands.c"
 		}
 	}
-	goto __finally457;
-	__catch457_database_error:
+	goto __finally465;
+	__catch465_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -5622,9 +5606,9 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		app_window_database_error (_tmp9_);
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_error_free0 (err);
-#line 5626 "Commands.c"
+#line 5610 "Commands.c"
 	}
-	__finally457:
+	__finally465:
 	{
 		AppWindow* _tmp10_;
 		AppWindow* _tmp11_;
@@ -5636,7 +5620,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5640 "Commands.c"
+#line 5624 "Commands.c"
 	}
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5646,7 +5630,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		g_clear_error (&_inner_error_);
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 5650 "Commands.c"
+#line 5634 "Commands.c"
 	}
 }
 
@@ -5656,7 +5640,7 @@ static void multiple_data_source_at_once_command_real_undo_on_all (MultipleDataS
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_at_once_command_undo_on_all'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 476 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 5660 "Commands.c"
+#line 5644 "Commands.c"
 }
 
 
@@ -5665,7 +5649,7 @@ void multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceC
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self));
 #line 476 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_CLASS (self)->undo_on_all (self, sources);
-#line 5669 "Commands.c"
+#line 5653 "Commands.c"
 }
 
 
@@ -5674,7 +5658,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self));
 #line 478 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 5678 "Commands.c"
+#line 5662 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -5687,7 +5671,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 		_source_it = _tmp1_;
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5691 "Commands.c"
+#line 5675 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -5704,7 +5688,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 			if (!_tmp3_) {
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5708 "Commands.c"
+#line 5692 "Commands.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -5720,7 +5704,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 			_tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
 #line 480 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_) {
-#line 5724 "Commands.c"
+#line 5708 "Commands.c"
 				CommandManager* _tmp9_;
 				CommandManager* _tmp10_;
 #line 481 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5735,15 +5719,15 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 				_g_object_unref0 (source);
 #line 483 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5739 "Commands.c"
+#line 5723 "Commands.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5743 "Commands.c"
+#line 5727 "Commands.c"
 		}
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 5747 "Commands.c"
+#line 5731 "Commands.c"
 	}
 }
 
@@ -5763,7 +5747,7 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_data_source_at_once_command_finalize;
-#line 5767 "Commands.c"
+#line 5751 "Commands.c"
 }
 
 
@@ -5780,7 +5764,7 @@ static void multiple_data_source_at_once_command_instance_init (MultipleDataSour
 	_tmp1_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 415 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->hooked_collections = _tmp1_;
-#line 5784 "Commands.c"
+#line 5768 "Commands.c"
 }
 
 
@@ -5788,7 +5772,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 	MultipleDataSourceAtOnceCommand * self;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
-#line 5792 "Commands.c"
+#line 5776 "Commands.c"
 	{
 		GeeIterator* _source_collection_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -5801,7 +5785,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 		_source_collection_it = _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5805 "Commands.c"
+#line 5789 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* source_collection = NULL;
@@ -5817,7 +5801,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 			if (!_tmp3_) {
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5821 "Commands.c"
+#line 5805 "Commands.c"
 			}
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_collection_it;
@@ -5833,11 +5817,11 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self);
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (source_collection);
-#line 5837 "Commands.c"
+#line 5821 "Commands.c"
 		}
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_collection_it);
-#line 5841 "Commands.c"
+#line 5825 "Commands.c"
 	}
 #line 414 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->sources);
@@ -5845,7 +5829,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->hooked_collections);
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (multiple_data_source_at_once_command_parent_class)->finalize (obj);
-#line 5849 "Commands.c"
+#line 5833 "Commands.c"
 }
 
 
@@ -5864,7 +5848,7 @@ GType multiple_data_source_at_once_command_get_type (void) {
 static void _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) {
 #line 508 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_photo_transformation_command_on_state_broken ((MultiplePhotoTransformationCommand*) self);
-#line 5868 "Commands.c"
+#line 5852 "Commands.c"
 }
 
 
@@ -5897,7 +5881,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 	_tmp4_ = explanation;
 #line 495 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (MultiplePhotoTransformationCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 5901 "Commands.c"
+#line 5885 "Commands.c"
 	{
 		GeeArrayList* _source_list = NULL;
 		GeeArrayList* _tmp5_;
@@ -5925,7 +5909,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 		_source_index = -1;
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5929 "Commands.c"
+#line 5913 "Commands.c"
 			gint _tmp10_;
 			gint _tmp11_;
 			gint _tmp12_;
@@ -5955,7 +5939,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 			if (!(_tmp11_ < _tmp12_)) {
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5959 "Commands.c"
+#line 5943 "Commands.c"
 			}
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_list;
@@ -5995,15 +5979,15 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 			_g_object_unref0 (photo);
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5999 "Commands.c"
+#line 5983 "Commands.c"
 		}
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_list);
-#line 6003 "Commands.c"
+#line 5987 "Commands.c"
 	}
 #line 493 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6007 "Commands.c"
+#line 5991 "Commands.c"
 }
 
 
@@ -6039,7 +6023,7 @@ static void multiple_photo_transformation_command_real_undo_on_source (MultipleD
 	_g_object_unref0 (state);
 #line 511 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 6043 "Commands.c"
+#line 6027 "Commands.c"
 }
 
 
@@ -6056,7 +6040,7 @@ static void multiple_photo_transformation_command_on_state_broken (MultiplePhoto
 	command_manager_reset (_tmp1_);
 #line 521 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 6060 "Commands.c"
+#line 6044 "Commands.c"
 }
 
 
@@ -6069,7 +6053,7 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_photo_transformation_command_real_undo_on_source;
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_photo_transformation_command_finalize;
-#line 6073 "Commands.c"
+#line 6057 "Commands.c"
 }
 
 
@@ -6081,7 +6065,7 @@ static void multiple_photo_transformation_command_instance_init (MultiplePhotoTr
 	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 490 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->map = _tmp0_;
-#line 6085 "Commands.c"
+#line 6069 "Commands.c"
 }
 
 
@@ -6089,7 +6073,7 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) {
 	MultiplePhotoTransformationCommand * self;
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand);
-#line 6093 "Commands.c"
+#line 6077 "Commands.c"
 	{
 		GeeIterator* _state_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -6116,7 +6100,7 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) {
 		_state_it = _tmp5_;
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6120 "Commands.c"
+#line 6104 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			PhotoTransformationState* state = NULL;
@@ -6132,7 +6116,7 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) {
 			if (!_tmp7_) {
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6136 "Commands.c"
+#line 6120 "Commands.c"
 			}
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _state_it;
@@ -6148,17 +6132,17 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self);
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (state);
-#line 6152 "Commands.c"
+#line 6136 "Commands.c"
 		}
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_state_it);
-#line 6156 "Commands.c"
+#line 6140 "Commands.c"
 	}
 #line 490 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->map);
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (multiple_photo_transformation_command_parent_class)->finalize (obj);
-#line 6162 "Commands.c"
+#line 6146 "Commands.c"
 }
 
 
@@ -6200,14 +6184,14 @@ RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo*
 	self->priv->rotation = _tmp3_;
 #line 528 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6204 "Commands.c"
+#line 6188 "Commands.c"
 }
 
 
 RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation) {
 #line 528 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rotate_single_command_construct (TYPE_ROTATE_SINGLE_COMMAND, photo, rotation, name, explanation);
-#line 6211 "Commands.c"
+#line 6195 "Commands.c"
 }
 
 
@@ -6223,7 +6207,7 @@ static void rotate_single_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->rotation;
 #line 535 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 6227 "Commands.c"
+#line 6211 "Commands.c"
 }
 
 
@@ -6242,7 +6226,7 @@ static void rotate_single_command_real_undo (Command* base) {
 	_tmp2_ = rotation_opposite (_tmp1_);
 #line 539 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp2_);
-#line 6246 "Commands.c"
+#line 6230 "Commands.c"
 }
 
 
@@ -6257,14 +6241,14 @@ static void rotate_single_command_class_init (RotateSingleCommandClass * klass)
 	((CommandClass *) klass)->undo = (void (*) (Command *)) rotate_single_command_real_undo;
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rotate_single_command_finalize;
-#line 6261 "Commands.c"
+#line 6245 "Commands.c"
 }
 
 
 static void rotate_single_command_instance_init (RotateSingleCommand * self) {
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ROTATE_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 6268 "Commands.c"
+#line 6252 "Commands.c"
 }
 
 
@@ -6274,7 +6258,7 @@ static void rotate_single_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rotate_single_command_parent_class)->finalize (obj);
-#line 6278 "Commands.c"
+#line 6262 "Commands.c"
 }
 
 
@@ -6326,14 +6310,14 @@ RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, Gee
 	self->priv->rotation = _tmp5_;
 #line 546 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6330 "Commands.c"
+#line 6314 "Commands.c"
 }
 
 
 RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text) {
 #line 546 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rotate_multiple_command_construct (TYPE_ROTATE_MULTIPLE_COMMAND, iter, rotation, name, explanation, progress_text, undo_progress_text);
-#line 6337 "Commands.c"
+#line 6321 "Commands.c"
 }
 
 
@@ -6351,7 +6335,7 @@ static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCo
 	_tmp1_ = self->priv->rotation;
 #line 554 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 6355 "Commands.c"
+#line 6339 "Commands.c"
 }
 
 
@@ -6372,7 +6356,7 @@ static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceComma
 	_tmp2_ = rotation_opposite (_tmp1_);
 #line 558 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp2_);
-#line 6376 "Commands.c"
+#line 6360 "Commands.c"
 }
 
 
@@ -6387,14 +6371,14 @@ static void rotate_multiple_command_class_init (RotateMultipleCommandClass * kla
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) rotate_multiple_command_real_undo_on_source;
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rotate_multiple_command_finalize;
-#line 6391 "Commands.c"
+#line 6375 "Commands.c"
 }
 
 
 static void rotate_multiple_command_instance_init (RotateMultipleCommand * self) {
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ROTATE_MULTIPLE_COMMAND_GET_PRIVATE (self);
-#line 6398 "Commands.c"
+#line 6382 "Commands.c"
 }
 
 
@@ -6404,7 +6388,7 @@ static void rotate_multiple_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rotate_multiple_command_parent_class)->finalize (obj);
-#line 6408 "Commands.c"
+#line 6392 "Commands.c"
 }
 
 
@@ -6461,14 +6445,14 @@ EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource*
 	_g_free0 (title);
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6465 "Commands.c"
+#line 6449 "Commands.c"
 }
 
 
 EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title) {
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_title_command_construct (TYPE_EDIT_TITLE_COMMAND, source, new_title);
-#line 6472 "Commands.c"
+#line 6456 "Commands.c"
 }
 
 
@@ -6484,7 +6468,7 @@ static void edit_title_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_title;
 #line 576 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6488 "Commands.c"
+#line 6472 "Commands.c"
 }
 
 
@@ -6500,7 +6484,7 @@ static void edit_title_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_title;
 #line 580 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6504 "Commands.c"
+#line 6488 "Commands.c"
 }
 
 
@@ -6515,14 +6499,14 @@ static void edit_title_command_class_init (EditTitleCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) edit_title_command_real_undo;
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_title_command_finalize;
-#line 6519 "Commands.c"
+#line 6503 "Commands.c"
 }
 
 
 static void edit_title_command_instance_init (EditTitleCommand * self) {
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_TITLE_COMMAND_GET_PRIVATE (self);
-#line 6526 "Commands.c"
+#line 6510 "Commands.c"
 }
 
 
@@ -6536,7 +6520,7 @@ static void edit_title_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_title);
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_title_command_parent_class)->finalize (obj);
-#line 6540 "Commands.c"
+#line 6524 "Commands.c"
 }
 
 
@@ -6585,14 +6569,14 @@ EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSour
 	self->priv->old_comment = _tmp4_;
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6589 "Commands.c"
+#line 6573 "Commands.c"
 }
 
 
 EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment) {
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_comment_command_construct (TYPE_EDIT_COMMENT_COMMAND, source, new_comment);
-#line 6596 "Commands.c"
+#line 6580 "Commands.c"
 }
 
 
@@ -6608,7 +6592,7 @@ static void edit_comment_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_comment;
 #line 596 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6612 "Commands.c"
+#line 6596 "Commands.c"
 }
 
 
@@ -6624,7 +6608,7 @@ static void edit_comment_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_comment;
 #line 600 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6628 "Commands.c"
+#line 6612 "Commands.c"
 }
 
 
@@ -6639,14 +6623,14 @@ static void edit_comment_command_class_init (EditCommentCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) edit_comment_command_real_undo;
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_comment_command_finalize;
-#line 6643 "Commands.c"
+#line 6627 "Commands.c"
 }
 
 
 static void edit_comment_command_instance_init (EditCommentCommand * self) {
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 6650 "Commands.c"
+#line 6634 "Commands.c"
 }
 
 
@@ -6660,7 +6644,7 @@ static void edit_comment_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_comment);
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_comment_command_parent_class)->finalize (obj);
-#line 6664 "Commands.c"
+#line 6648 "Commands.c"
 }
 
 
@@ -6706,7 +6690,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 	_g_free0 (self->new_title);
 #line 613 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->new_title = _tmp4_;
-#line 6710 "Commands.c"
+#line 6694 "Commands.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp5_;
@@ -6719,7 +6703,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 		_media_it = _tmp6_;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6723 "Commands.c"
+#line 6707 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			MediaSource* media = NULL;
@@ -6738,7 +6722,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 			if (!_tmp8_) {
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6742 "Commands.c"
+#line 6726 "Commands.c"
 			}
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _media_it;
@@ -6762,24 +6746,24 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 			_g_free0 (_tmp15_);
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (media);
-#line 6766 "Commands.c"
+#line 6750 "Commands.c"
 		}
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_media_it);
-#line 6770 "Commands.c"
+#line 6754 "Commands.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (title);
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6776 "Commands.c"
+#line 6760 "Commands.c"
 }
 
 
 EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title) {
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_multiple_titles_command_construct (TYPE_EDIT_MULTIPLE_TITLES_COMMAND, media_sources, new_title);
-#line 6783 "Commands.c"
+#line 6767 "Commands.c"
 }
 
 
@@ -6789,7 +6773,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
 #line 618 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6793 "Commands.c"
+#line 6777 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -6802,7 +6786,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 		_source_it = _tmp1_;
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6806 "Commands.c"
+#line 6790 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -6818,7 +6802,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 			if (!_tmp3_) {
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6822 "Commands.c"
+#line 6806 "Commands.c"
 			}
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -6834,11 +6818,11 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 			media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 6838 "Commands.c"
+#line 6822 "Commands.c"
 		}
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 6842 "Commands.c"
+#line 6826 "Commands.c"
 	}
 }
 
@@ -6849,7 +6833,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
 #line 623 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6853 "Commands.c"
+#line 6837 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -6862,7 +6846,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 		_source_it = _tmp1_;
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6866 "Commands.c"
+#line 6850 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -6881,7 +6865,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 			if (!_tmp3_) {
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6885 "Commands.c"
+#line 6869 "Commands.c"
 			}
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -6905,11 +6889,11 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 			_g_free0 (_tmp10_);
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 6909 "Commands.c"
+#line 6893 "Commands.c"
 		}
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 6913 "Commands.c"
+#line 6897 "Commands.c"
 	}
 }
 
@@ -6923,7 +6907,7 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all;
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_multiple_titles_command_finalize;
-#line 6927 "Commands.c"
+#line 6911 "Commands.c"
 }
 
 
@@ -6933,7 +6917,7 @@ static void edit_multiple_titles_command_instance_init (EditMultipleTitlesComman
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 606 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->old_titles = _tmp0_;
-#line 6937 "Commands.c"
+#line 6921 "Commands.c"
 }
 
 
@@ -6947,7 +6931,7 @@ static void edit_multiple_titles_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->old_titles);
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_multiple_titles_command_parent_class)->finalize (obj);
-#line 6951 "Commands.c"
+#line 6935 "Commands.c"
 }
 
 
@@ -6984,7 +6968,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 	_g_free0 (self->new_comment);
 #line 636 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->new_comment = _tmp2_;
-#line 6988 "Commands.c"
+#line 6972 "Commands.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp3_;
@@ -6997,7 +6981,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 		_media_it = _tmp4_;
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7001 "Commands.c"
+#line 6985 "Commands.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			MediaSource* media = NULL;
@@ -7016,7 +7000,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 			if (!_tmp6_) {
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7020 "Commands.c"
+#line 7004 "Commands.c"
 			}
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = _media_it;
@@ -7040,22 +7024,22 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 			_g_free0 (_tmp13_);
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (media);
-#line 7044 "Commands.c"
+#line 7028 "Commands.c"
 		}
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_media_it);
-#line 7048 "Commands.c"
+#line 7032 "Commands.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7052 "Commands.c"
+#line 7036 "Commands.c"
 }
 
 
 EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment) {
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_multiple_comments_command_construct (TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, media_sources, new_comment);
-#line 7059 "Commands.c"
+#line 7043 "Commands.c"
 }
 
 
@@ -7065,7 +7049,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
 #line 641 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7069 "Commands.c"
+#line 7053 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -7078,7 +7062,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 		_source_it = _tmp1_;
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7082 "Commands.c"
+#line 7066 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -7094,7 +7078,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 			if (!_tmp3_) {
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7098 "Commands.c"
+#line 7082 "Commands.c"
 			}
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -7110,11 +7094,11 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 			media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 7114 "Commands.c"
+#line 7098 "Commands.c"
 		}
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 7118 "Commands.c"
+#line 7102 "Commands.c"
 	}
 }
 
@@ -7125,7 +7109,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
 #line 646 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7129 "Commands.c"
+#line 7113 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -7138,7 +7122,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 		_source_it = _tmp1_;
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7142 "Commands.c"
+#line 7126 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -7157,7 +7141,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 			if (!_tmp3_) {
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7161 "Commands.c"
+#line 7145 "Commands.c"
 			}
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -7181,11 +7165,11 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 			_g_free0 (_tmp10_);
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 7185 "Commands.c"
+#line 7169 "Commands.c"
 		}
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 7189 "Commands.c"
+#line 7173 "Commands.c"
 	}
 }
 
@@ -7199,7 +7183,7 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all;
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_multiple_comments_command_finalize;
-#line 7203 "Commands.c"
+#line 7187 "Commands.c"
 }
 
 
@@ -7209,7 +7193,7 @@ static void edit_multiple_comments_command_instance_init (EditMultipleCommentsCo
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 631 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->old_comments = _tmp0_;
-#line 7213 "Commands.c"
+#line 7197 "Commands.c"
 }
 
 
@@ -7223,7 +7207,7 @@ static void edit_multiple_comments_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->old_comments);
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_multiple_comments_command_parent_class)->finalize (obj);
-#line 7227 "Commands.c"
+#line 7211 "Commands.c"
 }
 
 
@@ -7272,14 +7256,14 @@ RenameEventCommand* rename_event_command_construct (GType object_type, Event* ev
 	self->priv->old_name = _tmp4_;
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7276 "Commands.c"
+#line 7260 "Commands.c"
 }
 
 
 RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name) {
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_event_command_construct (TYPE_RENAME_EVENT_COMMAND, event, new_name);
-#line 7283 "Commands.c"
+#line 7267 "Commands.c"
 }
 
 
@@ -7297,7 +7281,7 @@ static void rename_event_command_real_execute_on_source (SimpleProxyableCommand*
 	_tmp1_ = self->priv->new_name;
 #line 664 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7301 "Commands.c"
+#line 7285 "Commands.c"
 }
 
 
@@ -7315,7 +7299,7 @@ static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* ba
 	_tmp1_ = self->priv->old_name;
 #line 668 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7319 "Commands.c"
+#line 7303 "Commands.c"
 }
 
 
@@ -7330,14 +7314,14 @@ static void rename_event_command_class_init (RenameEventCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_event_command_real_undo_on_source;
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_event_command_finalize;
-#line 7334 "Commands.c"
+#line 7318 "Commands.c"
 }
 
 
 static void rename_event_command_instance_init (RenameEventCommand * self) {
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_EVENT_COMMAND_GET_PRIVATE (self);
-#line 7341 "Commands.c"
+#line 7325 "Commands.c"
 }
 
 
@@ -7351,7 +7335,7 @@ static void rename_event_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_name);
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_event_command_parent_class)->finalize (obj);
-#line 7355 "Commands.c"
+#line 7339 "Commands.c"
 }
 
 
@@ -7400,14 +7384,14 @@ EditEventCommentCommand* edit_event_comment_command_construct (GType object_type
 	self->priv->old_comment = _tmp4_;
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7404 "Commands.c"
+#line 7388 "Commands.c"
 }
 
 
 EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment) {
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_event_comment_command_construct (TYPE_EDIT_EVENT_COMMENT_COMMAND, event, new_comment);
-#line 7411 "Commands.c"
+#line 7395 "Commands.c"
 }
 
 
@@ -7425,7 +7409,7 @@ static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCo
 	_tmp1_ = self->priv->new_comment;
 #line 684 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7429 "Commands.c"
+#line 7413 "Commands.c"
 }
 
 
@@ -7443,7 +7427,7 @@ static void edit_event_comment_command_real_undo_on_source (SimpleProxyableComma
 	_tmp1_ = self->priv->old_comment;
 #line 688 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7447 "Commands.c"
+#line 7431 "Commands.c"
 }
 
 
@@ -7458,14 +7442,14 @@ static void edit_event_comment_command_class_init (EditEventCommentCommandClass
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) edit_event_comment_command_real_undo_on_source;
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_event_comment_command_finalize;
-#line 7462 "Commands.c"
+#line 7446 "Commands.c"
 }
 
 
 static void edit_event_comment_command_instance_init (EditEventCommentCommand * self) {
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 7469 "Commands.c"
+#line 7453 "Commands.c"
 }
 
 
@@ -7479,7 +7463,7 @@ static void edit_event_comment_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_comment);
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_event_comment_command_parent_class)->finalize (obj);
-#line 7483 "Commands.c"
+#line 7467 "Commands.c"
 }
 
 
@@ -7528,14 +7512,14 @@ SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* e
 	self->priv->old_primary_source = _tmp4_;
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7532 "Commands.c"
+#line 7516 "Commands.c"
 }
 
 
 SetKeyPhotoCommand* set_key_photo_command_new (Event* event, MediaSource* new_primary_source) {
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_key_photo_command_construct (TYPE_SET_KEY_PHOTO_COMMAND, event, new_primary_source);
-#line 7539 "Commands.c"
+#line 7523 "Commands.c"
 }
 
 
@@ -7551,7 +7535,7 @@ static void set_key_photo_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_primary_source;
 #line 704 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7555 "Commands.c"
+#line 7539 "Commands.c"
 }
 
 
@@ -7567,7 +7551,7 @@ static void set_key_photo_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_primary_source;
 #line 708 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7571 "Commands.c"
+#line 7555 "Commands.c"
 }
 
 
@@ -7582,14 +7566,14 @@ static void set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) set_key_photo_command_real_undo;
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_key_photo_command_finalize;
-#line 7586 "Commands.c"
+#line 7570 "Commands.c"
 }
 
 
 static void set_key_photo_command_instance_init (SetKeyPhotoCommand * self) {
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_KEY_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 7593 "Commands.c"
+#line 7577 "Commands.c"
 }
 
 
@@ -7603,7 +7587,7 @@ static void set_key_photo_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->old_primary_source);
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_key_photo_command_parent_class)->finalize (obj);
-#line 7607 "Commands.c"
+#line 7591 "Commands.c"
 }
 
 
@@ -7630,14 +7614,14 @@ RevertSingleCommand* revert_single_command_construct (GType object_type, Photo*
 	self = (RevertSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_REVERT_LABEL, "");
 #line 713 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7634 "Commands.c"
+#line 7618 "Commands.c"
 }
 
 
 RevertSingleCommand* revert_single_command_new (Photo* photo) {
 #line 713 "/home/jens/Source/shotwell/src/Commands.vala"
 	return revert_single_command_construct (TYPE_REVERT_SINGLE_COMMAND, photo);
-#line 7641 "Commands.c"
+#line 7625 "Commands.c"
 }
 
 
@@ -7652,7 +7636,7 @@ static void revert_single_command_real_execute_on_photo (GenericPhotoTransformat
 	_tmp0_ = photo;
 #line 718 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_remove_all_transformations (_tmp0_);
-#line 7656 "Commands.c"
+#line 7640 "Commands.c"
 }
 
 
@@ -7686,7 +7670,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 		_g_object_unref0 (revert_single_command);
 #line 724 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7690 "Commands.c"
+#line 7674 "Commands.c"
 	}
 #line 726 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = revert_single_command;
@@ -7702,7 +7686,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 		_g_object_unref0 (revert_single_command);
 #line 727 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7706 "Commands.c"
+#line 7690 "Commands.c"
 	}
 #line 731 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = TRUE;
@@ -7710,7 +7694,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 	_g_object_unref0 (revert_single_command);
 #line 731 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 7714 "Commands.c"
+#line 7698 "Commands.c"
 }
 
 
@@ -7721,7 +7705,7 @@ static void revert_single_command_class_init (RevertSingleCommandClass * klass)
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) revert_single_command_real_execute_on_photo;
 #line 712 "/home/jens/Source/shotwell/src/Commands.vala"
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) revert_single_command_real_compress;
-#line 7725 "Commands.c"
+#line 7709 "Commands.c"
 }
 
 
@@ -7752,14 +7736,14 @@ RevertMultipleCommand* revert_multiple_command_construct (GType object_type, Gee
 	self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Reverting"), _ ("Undoing Revert"), RESOURCES_REVERT_LABEL, "");
 #line 736 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7756 "Commands.c"
+#line 7740 "Commands.c"
 }
 
 
 RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter) {
 #line 736 "/home/jens/Source/shotwell/src/Commands.vala"
 	return revert_multiple_command_construct (TYPE_REVERT_MULTIPLE_COMMAND, iter);
-#line 7763 "Commands.c"
+#line 7747 "Commands.c"
 }
 
 
@@ -7774,7 +7758,7 @@ static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCo
 	_tmp0_ = source;
 #line 742 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 7778 "Commands.c"
+#line 7762 "Commands.c"
 }
 
 
@@ -7783,7 +7767,7 @@ static void revert_multiple_command_class_init (RevertMultipleCommandClass * kla
 	revert_multiple_command_parent_class = g_type_class_peek_parent (klass);
 #line 735 "/home/jens/Source/shotwell/src/Commands.vala"
 	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) revert_multiple_command_real_execute_on_source;
-#line 7787 "Commands.c"
+#line 7771 "Commands.c"
 }
 
 
@@ -7814,14 +7798,14 @@ EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo
 	self = (EnhanceSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
 #line 747 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7818 "Commands.c"
+#line 7802 "Commands.c"
 }
 
 
 EnhanceSingleCommand* enhance_single_command_new (Photo* photo) {
 #line 747 "/home/jens/Source/shotwell/src/Commands.vala"
 	return enhance_single_command_construct (TYPE_ENHANCE_SINGLE_COMMAND, photo);
-#line 7825 "Commands.c"
+#line 7809 "Commands.c"
 }
 
 
@@ -7856,7 +7840,7 @@ static void enhance_single_command_real_execute_on_photo (GenericPhotoTransforma
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow));
 #line 763 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 7860 "Commands.c"
+#line 7844 "Commands.c"
 }
 
 
@@ -7890,7 +7874,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 		_g_object_unref0 (enhance_single_command);
 #line 769 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7894 "Commands.c"
+#line 7878 "Commands.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = enhance_single_command;
@@ -7906,7 +7890,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 		_g_object_unref0 (enhance_single_command);
 #line 772 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7910 "Commands.c"
+#line 7894 "Commands.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = TRUE;
@@ -7914,7 +7898,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 	_g_object_unref0 (enhance_single_command);
 #line 775 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 7918 "Commands.c"
+#line 7902 "Commands.c"
 }
 
 
@@ -7925,7 +7909,7 @@ static void enhance_single_command_class_init (EnhanceSingleCommandClass * klass
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) enhance_single_command_real_execute_on_photo;
 #line 746 "/home/jens/Source/shotwell/src/Commands.vala"
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) enhance_single_command_real_compress;
-#line 7929 "Commands.c"
+#line 7913 "Commands.c"
 }
 
 
@@ -7956,14 +7940,14 @@ EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, G
 	self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Enhancing"), _ ("Undoing Enhance"), RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
 #line 780 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7960 "Commands.c"
+#line 7944 "Commands.c"
 }
 
 
 EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter) {
 #line 780 "/home/jens/Source/shotwell/src/Commands.vala"
 	return enhance_multiple_command_construct (TYPE_ENHANCE_MULTIPLE_COMMAND, iter);
-#line 7967 "Commands.c"
+#line 7951 "Commands.c"
 }
 
 
@@ -7978,7 +7962,7 @@ static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceC
 	_tmp0_ = source;
 #line 786 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_enhance (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 7982 "Commands.c"
+#line 7966 "Commands.c"
 }
 
 
@@ -7987,7 +7971,7 @@ static void enhance_multiple_command_class_init (EnhanceMultipleCommandClass * k
 	enhance_multiple_command_parent_class = g_type_class_peek_parent (klass);
 #line 779 "/home/jens/Source/shotwell/src/Commands.vala"
 	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) enhance_multiple_command_real_execute_on_source;
-#line 7991 "Commands.c"
+#line 7975 "Commands.c"
 }
 
 
@@ -8040,14 +8024,14 @@ StraightenCommand* straighten_command_construct (GType object_type, Photo* photo
 	self->priv->crop = _tmp4_;
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8044 "Commands.c"
+#line 8028 "Commands.c"
 }
 
 
 StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) {
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
 	return straighten_command_construct (TYPE_STRAIGHTEN_COMMAND, photo, theta, crop, name, explanation);
-#line 8051 "Commands.c"
+#line 8035 "Commands.c"
 }
 
 
@@ -8076,13 +8060,13 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
 	_tmp2_ = collection;
 #line 804 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 8080 "Commands.c"
+#line 8064 "Commands.c"
 		DataCollection* _tmp3_;
 #line 805 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = collection;
 #line 805 "/home/jens/Source/shotwell/src/Commands.vala"
 		data_collection_freeze_notifications (_tmp3_);
-#line 8086 "Commands.c"
+#line 8070 "Commands.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = photo;
@@ -8100,17 +8084,17 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
 	_tmp8_ = collection;
 #line 810 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_ != NULL) {
-#line 8104 "Commands.c"
+#line 8088 "Commands.c"
 		DataCollection* _tmp9_;
 #line 811 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = collection;
 #line 811 "/home/jens/Source/shotwell/src/Commands.vala"
 		data_collection_thaw_notifications (_tmp9_);
-#line 8110 "Commands.c"
+#line 8094 "Commands.c"
 	}
 #line 801 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (collection);
-#line 8114 "Commands.c"
+#line 8098 "Commands.c"
 }
 
 
@@ -8123,14 +8107,14 @@ static void straighten_command_class_init (StraightenCommandClass * klass) {
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) straighten_command_real_execute_on_photo;
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = straighten_command_finalize;
-#line 8127 "Commands.c"
+#line 8111 "Commands.c"
 }
 
 
 static void straighten_command_instance_init (StraightenCommand * self) {
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = STRAIGHTEN_COMMAND_GET_PRIVATE (self);
-#line 8134 "Commands.c"
+#line 8118 "Commands.c"
 }
 
 
@@ -8140,7 +8124,7 @@ static void straighten_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRAIGHTEN_COMMAND, StraightenCommand);
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (straighten_command_parent_class)->finalize (obj);
-#line 8144 "Commands.c"
+#line 8128 "Commands.c"
 }
 
 
@@ -8184,14 +8168,14 @@ CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop,
 	self->priv->crop = _tmp3_;
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8188 "Commands.c"
+#line 8172 "Commands.c"
 }
 
 
 CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation) {
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
 	return crop_command_construct (TYPE_CROP_COMMAND, photo, crop, name, explanation);
-#line 8195 "Commands.c"
+#line 8179 "Commands.c"
 }
 
 
@@ -8209,7 +8193,7 @@ static void crop_command_real_execute_on_photo (GenericPhotoTransformationComman
 	_tmp1_ = self->priv->crop;
 #line 825 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_set_crop (_tmp0_, &_tmp1_);
-#line 8213 "Commands.c"
+#line 8197 "Commands.c"
 }
 
 
@@ -8222,14 +8206,14 @@ static void crop_command_class_init (CropCommandClass * klass) {
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) crop_command_real_execute_on_photo;
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = crop_command_finalize;
-#line 8226 "Commands.c"
+#line 8210 "Commands.c"
 }
 
 
 static void crop_command_instance_init (CropCommand * self) {
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = CROP_COMMAND_GET_PRIVATE (self);
-#line 8233 "Commands.c"
+#line 8217 "Commands.c"
 }
 
 
@@ -8239,7 +8223,7 @@ static void crop_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CROP_COMMAND, CropCommand);
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (crop_command_parent_class)->finalize (obj);
-#line 8243 "Commands.c"
+#line 8227 "Commands.c"
 }
 
 
@@ -8258,7 +8242,7 @@ GType crop_command_get_type (void) {
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
 #line 836 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 8262 "Commands.c"
+#line 8246 "Commands.c"
 }
 
 
@@ -8295,14 +8279,14 @@ AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_
 	self->priv->transformations = _tmp4_;
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8299 "Commands.c"
+#line 8283 "Commands.c"
 }
 
 
 AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_colors_single_command_construct (TYPE_ADJUST_COLORS_SINGLE_COMMAND, photo, transformations, name, explanation);
-#line 8306 "Commands.c"
+#line 8290 "Commands.c"
 }
 
 
@@ -8340,7 +8324,7 @@ static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTran
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
 #line 844 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp5_);
-#line 8344 "Commands.c"
+#line 8328 "Commands.c"
 }
 
 
@@ -8358,7 +8342,7 @@ static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTran
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ADJUST_COLORS_SINGLE_COMMAND);
 #line 848 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 8362 "Commands.c"
+#line 8346 "Commands.c"
 }
 
 
@@ -8373,14 +8357,14 @@ static void adjust_colors_single_command_class_init (AdjustColorsSingleCommandCl
 	((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*) (GenericPhotoTransformationCommand *, Command*)) adjust_colors_single_command_real_can_compress;
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_colors_single_command_finalize;
-#line 8377 "Commands.c"
+#line 8361 "Commands.c"
 }
 
 
 static void adjust_colors_single_command_instance_init (AdjustColorsSingleCommand * self) {
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 8384 "Commands.c"
+#line 8368 "Commands.c"
 }
 
 
@@ -8392,7 +8376,7 @@ static void adjust_colors_single_command_finalize (GObject * obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_colors_single_command_parent_class)->finalize (obj);
-#line 8396 "Commands.c"
+#line 8380 "Commands.c"
 }
 
 
@@ -8441,14 +8425,14 @@ AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType obj
 	self->priv->transformations = _tmp4_;
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8445 "Commands.c"
+#line 8429 "Commands.c"
 }
 
 
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_colors_multiple_command_construct (TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, iter, transformations, name, explanation);
-#line 8452 "Commands.c"
+#line 8436 "Commands.c"
 }
 
 
@@ -8466,7 +8450,7 @@ static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataS
 	_tmp1_ = self->priv->transformations;
 #line 864 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_set_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 8470 "Commands.c"
+#line 8454 "Commands.c"
 }
 
 
@@ -8479,14 +8463,14 @@ static void adjust_colors_multiple_command_class_init (AdjustColorsMultipleComma
 	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_colors_multiple_command_real_execute_on_source;
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_colors_multiple_command_finalize;
-#line 8483 "Commands.c"
+#line 8467 "Commands.c"
 }
 
 
 static void adjust_colors_multiple_command_instance_init (AdjustColorsMultipleCommand * self) {
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE (self);
-#line 8490 "Commands.c"
+#line 8474 "Commands.c"
 }
 
 
@@ -8498,7 +8482,7 @@ static void adjust_colors_multiple_command_finalize (GObject * obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_colors_multiple_command_parent_class)->finalize (obj);
-#line 8502 "Commands.c"
+#line 8486 "Commands.c"
 }
 
 
@@ -8542,14 +8526,14 @@ RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, Editin
 	self->priv->redeye_instance = _tmp3_;
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8546 "Commands.c"
+#line 8530 "Commands.c"
 }
 
 
 RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) {
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
 	return redeye_command_construct (TYPE_REDEYE_COMMAND, photo, redeye_instance, name, explanation);
-#line 8553 "Commands.c"
+#line 8537 "Commands.c"
 }
 
 
@@ -8567,7 +8551,7 @@ static void redeye_command_real_execute_on_photo (GenericPhotoTransformationComm
 	_tmp1_ = self->priv->redeye_instance;
 #line 879 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_add_redeye_instance (_tmp0_, &_tmp1_);
-#line 8571 "Commands.c"
+#line 8555 "Commands.c"
 }
 
 
@@ -8580,14 +8564,14 @@ static void redeye_command_class_init (RedeyeCommandClass * klass) {
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) redeye_command_real_execute_on_photo;
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = redeye_command_finalize;
-#line 8584 "Commands.c"
+#line 8568 "Commands.c"
 }
 
 
 static void redeye_command_instance_init (RedeyeCommand * self) {
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = REDEYE_COMMAND_GET_PRIVATE (self);
-#line 8591 "Commands.c"
+#line 8575 "Commands.c"
 }
 
 
@@ -8597,7 +8581,7 @@ static void redeye_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REDEYE_COMMAND, RedeyeCommand);
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (redeye_command_parent_class)->finalize (obj);
-#line 8601 "Commands.c"
+#line 8585 "Commands.c"
 }
 
 
@@ -8629,7 +8613,7 @@ MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar
 	self = (MovePhotosCommand*) command_construct (object_type, _tmp0_, _tmp1_);
 #line 967 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8633 "Commands.c"
+#line 8617 "Commands.c"
 }
 
 
@@ -8647,7 +8631,7 @@ static void move_photos_command_real_prepare (Command* base) {
 	_tmp1_ = self->real_command;
 #line 973 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_prepare (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8651 "Commands.c"
+#line 8635 "Commands.c"
 }
 
 
@@ -8665,7 +8649,7 @@ static void move_photos_command_real_execute (Command* base) {
 	_tmp1_ = self->real_command;
 #line 978 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8669 "Commands.c"
+#line 8653 "Commands.c"
 }
 
 
@@ -8683,21 +8667,21 @@ static void move_photos_command_real_undo (Command* base) {
 	_tmp1_ = self->real_command;
 #line 983 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_undo (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8687 "Commands.c"
+#line 8671 "Commands.c"
 }
 
 
 static void _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 914 "/home/jens/Source/shotwell/src/Commands.vala"
 	move_photos_command_real_move_photos_command_on_proxy_broken ((MovePhotosCommandRealMovePhotosCommand*) self);
-#line 8694 "Commands.c"
+#line 8678 "Commands.c"
 }
 
 
 static gpointer _source_proxy_ref0 (gpointer self) {
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? source_proxy_ref (self) : NULL;
-#line 8701 "Commands.c"
+#line 8685 "Commands.c"
 }
 
 
@@ -8735,7 +8719,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 	_tmp4_ = explanation;
 #line 893 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (MovePhotosCommandRealMovePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 8739 "Commands.c"
+#line 8723 "Commands.c"
 	{
 		GeeArrayList* _source_list = NULL;
 		GeeArrayList* _tmp5_;
@@ -8763,7 +8747,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 		_source_index = -1;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 8767 "Commands.c"
+#line 8751 "Commands.c"
 			gint _tmp10_;
 			gint _tmp11_;
 			gint _tmp12_;
@@ -8797,7 +8781,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			if (!(_tmp11_ < _tmp12_)) {
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 8801 "Commands.c"
+#line 8785 "Commands.c"
 			}
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_list;
@@ -8823,7 +8807,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_tmp21_ = old_event;
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp21_ != NULL) {
-#line 8827 "Commands.c"
+#line 8811 "Commands.c"
 				Event* _tmp22_;
 				SourceProxy* _tmp23_;
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8834,13 +8818,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 				_source_proxy_unref0 (_tmp20_);
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = _tmp23_;
-#line 8838 "Commands.c"
+#line 8822 "Commands.c"
 			} else {
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp20_);
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = NULL;
-#line 8844 "Commands.c"
+#line 8828 "Commands.c"
 			}
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp24_ = _source_proxy_ref0 (_tmp20_);
@@ -8850,13 +8834,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_tmp25_ = old_event_proxy;
 #line 902 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp25_ != NULL) {
-#line 8854 "Commands.c"
+#line 8838 "Commands.c"
 				SourceProxy* _tmp26_;
 #line 903 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp26_ = old_event_proxy;
 #line 903 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_connect_object (_tmp26_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
-#line 8860 "Commands.c"
+#line 8844 "Commands.c"
 			}
 #line 905 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp27_ = self->priv->old_events;
@@ -8876,11 +8860,11 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_g_object_unref0 (current_media);
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 8880 "Commands.c"
+#line 8864 "Commands.c"
 		}
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_list);
-#line 8884 "Commands.c"
+#line 8868 "Commands.c"
 	}
 #line 909 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = new_event;
@@ -8896,14 +8880,14 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 	g_signal_connect_object (_tmp32_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8900 "Commands.c"
+#line 8884 "Commands.c"
 }
 
 
 MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_new (Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
 	return move_photos_command_real_move_photos_command_construct (MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, new_event, source_views, progress_text, undo_progress_text, name, explanation);
-#line 8907 "Commands.c"
+#line 8891 "Commands.c"
 }
 
 
@@ -8916,23 +8900,25 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 	gboolean _tmp4_;
 #line 922 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+	COMMAND_CLASS (move_photos_command_real_move_photos_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = library_window_get_app ();
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = _tmp0_;
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = _tmp2_;
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_EVENT_PAGE);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp3_);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp1_);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 8936 "Commands.c"
+#line 8922 "Commands.c"
 		Event* evt = NULL;
 		LibraryWindow* _tmp5_;
 		LibraryWindow* _tmp6_;
@@ -8945,111 +8931,117 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 		GeeArrayList* _tmp13_;
 		gint _tmp14_;
 		gint _tmp15_;
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = library_window_get_app ();
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = _tmp5_;
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT_PAGE, EventPage);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = event_page_get_event (_tmp8_);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp9_;
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp8_);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		evt = _tmp10_;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp11_ = evt;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT_SOURCE, EventSource));
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp15_ = _tmp14_;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp12_ == _tmp15_) {
-#line 8979 "Commands.c"
+#line 8965 "Commands.c"
 			LibraryWindow* _tmp16_;
 			LibraryWindow* _tmp17_;
 			SourceProxy* _tmp18_;
 			DataSource* _tmp19_;
 			Event* _tmp20_;
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = library_window_get_app ();
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp17_ = _tmp16_;
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = self->priv->new_event_proxy;
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp19_ = source_proxy_get_source (_tmp18_);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT, Event);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			library_window_switch_to_event (_tmp17_, _tmp20_);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp20_);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp17_);
-#line 9001 "Commands.c"
+#line 8987 "Commands.c"
 		}
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (evt);
-#line 9005 "Commands.c"
+#line 8991 "Commands.c"
 	} else {
 		SourceProxy* _tmp21_;
 		DataSource* _tmp22_;
 		Event* _tmp23_;
 		gint _tmp24_;
-		gboolean _tmp25_;
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+		GeeArrayList* _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
+		gboolean _tmp28_;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp21_ = self->priv->new_event_proxy;
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp22_ = source_proxy_get_source (_tmp21_);
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_EVENT, Event);
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp24_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_EVENT_SOURCE, EventSource));
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp25_ = _tmp24_ == 0;
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp26_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp27_ = _tmp26_;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp28_ = _tmp24_ == _tmp27_;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp23_);
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
-		if (_tmp25_) {
-#line 9026 "Commands.c"
-			LibraryWindow* _tmp26_;
-			LibraryWindow* _tmp27_;
-			SourceProxy* _tmp28_;
-			DataSource* _tmp29_;
-			Event* _tmp30_;
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp26_ = library_window_get_app ();
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp27_ = _tmp26_;
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp28_ = self->priv->new_event_proxy;
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp29_ = source_proxy_get_source (_tmp28_);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_EVENT, Event);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			library_window_switch_to_event (_tmp27_, _tmp30_);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		if (_tmp28_) {
+#line 9021 "Commands.c"
+			LibraryWindow* _tmp29_;
+			LibraryWindow* _tmp30_;
+			SourceProxy* _tmp31_;
+			DataSource* _tmp32_;
+			Event* _tmp33_;
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp29_ = library_window_get_app ();
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp30_ = _tmp29_;
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp31_ = self->priv->new_event_proxy;
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp32_ = source_proxy_get_source (_tmp31_);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EVENT, Event);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			library_window_switch_to_event (_tmp30_, _tmp33_);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_g_object_unref0 (_tmp33_);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp30_);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_object_unref0 (_tmp27_);
-#line 9048 "Commands.c"
+#line 9043 "Commands.c"
 		}
 	}
-#line 946 "/home/jens/Source/shotwell/src/Commands.vala"
-	COMMAND_CLASS (move_photos_command_real_move_photos_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 9053 "Commands.c"
 }
 
 
@@ -9075,7 +9067,7 @@ static void move_photos_command_real_move_photos_command_real_execute_on_source
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 950 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp3_);
-#line 9079 "Commands.c"
+#line 9071 "Commands.c"
 }
 
 
@@ -9113,7 +9105,7 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 	_tmp6_ = event_proxy;
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 9117 "Commands.c"
+#line 9109 "Commands.c"
 		SourceProxy* _tmp7_;
 		DataSource* _tmp8_;
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9124,13 +9116,13 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 		_g_object_unref0 (_tmp5_);
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event);
-#line 9128 "Commands.c"
+#line 9120 "Commands.c"
 	} else {
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp5_);
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = NULL;
-#line 9134 "Commands.c"
+#line 9126 "Commands.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp9_ = current_media;
@@ -9142,7 +9134,7 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 	_source_proxy_unref0 (event_proxy);
 #line 953 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (current_media);
-#line 9146 "Commands.c"
+#line 9138 "Commands.c"
 }
 
 
@@ -9159,7 +9151,7 @@ static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePh
 	command_manager_reset (_tmp1_);
 #line 961 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 9163 "Commands.c"
+#line 9155 "Commands.c"
 }
 
 
@@ -9176,7 +9168,7 @@ static void move_photos_command_real_move_photos_command_class_init (MovePhotosC
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source;
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = move_photos_command_real_move_photos_command_finalize;
-#line 9180 "Commands.c"
+#line 9172 "Commands.c"
 }
 
 
@@ -9190,7 +9182,7 @@ static void move_photos_command_real_move_photos_command_instance_init (MovePhot
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 888 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->old_events = _tmp0_;
-#line 9194 "Commands.c"
+#line 9186 "Commands.c"
 }
 
 
@@ -9206,7 +9198,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 	g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp1_, NULL, FALSE);
 #line 914 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9210 "Commands.c"
+#line 9202 "Commands.c"
 	{
 		GeeIterator* _proxy_it = NULL;
 		GeeHashMap* _tmp2_;
@@ -9233,7 +9225,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 		_proxy_it = _tmp7_;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9237 "Commands.c"
+#line 9229 "Commands.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			SourceProxy* proxy = NULL;
@@ -9248,7 +9240,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 			if (!_tmp9_) {
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9252 "Commands.c"
+#line 9244 "Commands.c"
 			}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = _proxy_it;
@@ -9260,7 +9252,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 			_tmp12_ = proxy;
 #line 917 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_ != NULL) {
-#line 9264 "Commands.c"
+#line 9256 "Commands.c"
 				SourceProxy* _tmp13_;
 				guint _tmp14_;
 #line 918 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9269,15 +9261,15 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 				g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp14_, NULL, FALSE);
 #line 918 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9273 "Commands.c"
+#line 9265 "Commands.c"
 			}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 9277 "Commands.c"
+#line 9269 "Commands.c"
 		}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_it);
-#line 9281 "Commands.c"
+#line 9273 "Commands.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/Commands.vala"
 	_source_proxy_unref0 (self->priv->new_event_proxy);
@@ -9285,7 +9277,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 	_g_object_unref0 (self->priv->old_events);
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (move_photos_command_real_move_photos_command_parent_class)->finalize (obj);
-#line 9289 "Commands.c"
+#line 9281 "Commands.c"
 }
 
 
@@ -9312,7 +9304,7 @@ static void move_photos_command_class_init (MovePhotosCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) move_photos_command_real_undo;
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = move_photos_command_finalize;
-#line 9316 "Commands.c"
+#line 9308 "Commands.c"
 }
 
 
@@ -9328,7 +9320,7 @@ static void move_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->real_command);
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (move_photos_command_parent_class)->finalize (obj);
-#line 9332 "Commands.c"
+#line 9324 "Commands.c"
 }
 
 
@@ -9359,7 +9351,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 	self = (NewEventCommand*) move_photos_command_construct (object_type, RESOURCES_NEW_EVENT_LABEL, "");
 #line 992 "/home/jens/Source/shotwell/src/Commands.vala"
 	key_source = NULL;
-#line 9363 "Commands.c"
+#line 9355 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_;
@@ -9372,7 +9364,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 		_view_it = _tmp1_;
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9376 "Commands.c"
+#line 9368 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataView* view = NULL;
@@ -9390,7 +9382,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 			if (!_tmp3_) {
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9394 "Commands.c"
+#line 9386 "Commands.c"
 			}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _view_it;
@@ -9408,7 +9400,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 			_tmp8_ = key_source;
 #line 996 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ == NULL) {
-#line 9412 "Commands.c"
+#line 9404 "Commands.c"
 				MediaSource* _tmp9_;
 				MediaSource* _tmp10_;
 #line 997 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9425,17 +9417,17 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 				_g_object_unref0 (view);
 #line 998 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9429 "Commands.c"
+#line 9421 "Commands.c"
 			}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (current_source);
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 9435 "Commands.c"
+#line 9427 "Commands.c"
 		}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 9439 "Commands.c"
+#line 9431 "Commands.c"
 	}
 #line 1003 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = key_source;
@@ -9461,21 +9453,21 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 	_g_object_unref0 (key_source);
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9465 "Commands.c"
+#line 9457 "Commands.c"
 }
 
 
 NewEventCommand* new_event_command_new (GeeIterable* iter) {
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_event_command_construct (TYPE_NEW_EVENT_COMMAND, iter);
-#line 9472 "Commands.c"
+#line 9464 "Commands.c"
 }
 
 
 static void new_event_command_class_init (NewEventCommandClass * klass) {
 #line 987 "/home/jens/Source/shotwell/src/Commands.vala"
 	new_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9479 "Commands.c"
+#line 9471 "Commands.c"
 }
 
 
@@ -9518,21 +9510,21 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it
 	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp2_;
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9522 "Commands.c"
+#line 9514 "Commands.c"
 }
 
 
 SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event) {
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_event_command_construct (TYPE_SET_EVENT_COMMAND, iter, new_event);
-#line 9529 "Commands.c"
+#line 9521 "Commands.c"
 }
 
 
 static void set_event_command_class_init (SetEventCommandClass * klass) {
 #line 1013 "/home/jens/Source/shotwell/src/Commands.vala"
 	set_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9536 "Commands.c"
+#line 9528 "Commands.c"
 }
 
 
@@ -9580,7 +9572,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1034 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_thumbs = _tmp0_;
-#line 9584 "Commands.c"
+#line 9576 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp1_;
@@ -9593,7 +9585,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 		_view_it = _tmp2_;
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9597 "Commands.c"
+#line 9589 "Commands.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			DataView* view = NULL;
@@ -9611,7 +9603,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 			if (!_tmp4_) {
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9615 "Commands.c"
+#line 9607 "Commands.c"
 			}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _view_it;
@@ -9629,7 +9621,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 			_tmp9_ = master_event;
 #line 1040 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp9_ == NULL) {
-#line 9633 "Commands.c"
+#line 9625 "Commands.c"
 				Event* _tmp10_;
 				Event* _tmp11_;
 				Event* _tmp12_;
@@ -9656,7 +9648,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_tmp15_ = event_has_name (_tmp14_);
 #line 1045 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp15_) {
-#line 9660 "Commands.c"
+#line 9652 "Commands.c"
 					Event* _tmp16_;
 					gint _tmp17_;
 #line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9665,7 +9657,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_tmp17_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_SOURCE, EventSource));
 #line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
 					named_evt_src_count = _tmp17_;
-#line 9669 "Commands.c"
+#line 9661 "Commands.c"
 				}
 			} else {
 				Event* _tmp18_;
@@ -9676,7 +9668,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_tmp19_ = event_has_name (_tmp18_);
 #line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp19_) {
-#line 9680 "Commands.c"
+#line 9672 "Commands.c"
 					Event* _tmp20_;
 					gint _tmp21_;
 					gint _tmp22_;
@@ -9688,7 +9680,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_tmp22_ = named_evt_src_count;
 #line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp21_ > _tmp22_) {
-#line 9692 "Commands.c"
+#line 9684 "Commands.c"
 						Event* _tmp23_;
 						gint _tmp24_;
 						Event* _tmp25_;
@@ -9707,7 +9699,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 						_g_object_unref0 (master_event);
 #line 1053 "/home/jens/Source/shotwell/src/Commands.vala"
 						master_event = _tmp26_;
-#line 9711 "Commands.c"
+#line 9703 "Commands.c"
 					}
 				} else {
 					gint _tmp27_;
@@ -9715,7 +9707,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_tmp27_ = named_evt_src_count;
 #line 1055 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp27_ == 0) {
-#line 9719 "Commands.c"
+#line 9711 "Commands.c"
 						Event* _tmp28_;
 						gint _tmp29_;
 						gint _tmp30_;
@@ -9727,7 +9719,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 						_tmp30_ = unnamed_evt_src_count;
 #line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp29_ > _tmp30_) {
-#line 9731 "Commands.c"
+#line 9723 "Commands.c"
 							Event* _tmp31_;
 							gint _tmp32_;
 							Event* _tmp33_;
@@ -9746,7 +9738,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 							_g_object_unref0 (master_event);
 #line 1061 "/home/jens/Source/shotwell/src/Commands.vala"
 							master_event = _tmp34_;
-#line 9750 "Commands.c"
+#line 9742 "Commands.c"
 						}
 					}
 				}
@@ -9774,7 +9766,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_media_source_it = _tmp39_;
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 9778 "Commands.c"
+#line 9770 "Commands.c"
 					GeeIterator* _tmp40_;
 					gboolean _tmp41_;
 					MediaSource* media_source = NULL;
@@ -9792,7 +9784,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					if (!_tmp41_) {
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 9796 "Commands.c"
+#line 9788 "Commands.c"
 					}
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp42_ = _media_source_it;
@@ -9814,21 +9806,21 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_g_object_unref0 (_tmp47_);
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (media_source);
-#line 9818 "Commands.c"
+#line 9810 "Commands.c"
 				}
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_media_source_it);
-#line 9822 "Commands.c"
+#line 9814 "Commands.c"
 			}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 9828 "Commands.c"
+#line 9820 "Commands.c"
 		}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 9832 "Commands.c"
+#line 9824 "Commands.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp48_ = master_event;
@@ -9858,21 +9850,21 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 	_g_object_unref0 (master_event);
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9862 "Commands.c"
+#line 9854 "Commands.c"
 }
 
 
 MergeEventsCommand* merge_events_command_new (GeeIterable* iter) {
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	return merge_events_command_construct (TYPE_MERGE_EVENTS_COMMAND, iter);
-#line 9869 "Commands.c"
+#line 9861 "Commands.c"
 }
 
 
 static void merge_events_command_class_init (MergeEventsCommandClass * klass) {
 #line 1023 "/home/jens/Source/shotwell/src/Commands.vala"
 	merge_events_command_parent_class = g_type_class_peek_parent (klass);
-#line 9876 "Commands.c"
+#line 9868 "Commands.c"
 }
 
 
@@ -9895,7 +9887,7 @@ GType merge_events_command_get_type (void) {
 static void _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 1092 "/home/jens/Source/shotwell/src/Commands.vala"
 	duplicate_multiple_photos_command_on_photo_destroyed ((DuplicateMultiplePhotosCommand*) self, source);
-#line 9899 "Commands.c"
+#line 9891 "Commands.c"
 }
 
 
@@ -9915,14 +9907,14 @@ DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GTy
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
 #line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9919 "Commands.c"
+#line 9911 "Commands.c"
 }
 
 
 DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter) {
 #line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
 	return duplicate_multiple_photos_command_construct (TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, iter);
-#line 9926 "Commands.c"
+#line 9918 "Commands.c"
 }
 
 
@@ -9956,7 +9948,7 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
 	_g_object_unref0 (_tmp3_);
 #line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_) {
-#line 9960 "Commands.c"
+#line 9952 "Commands.c"
 		CommandManager* _tmp7_;
 		CommandManager* _tmp8_;
 #line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9967,7 +9959,7 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
 		command_manager_reset (_tmp8_);
 #line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp8_);
-#line 9971 "Commands.c"
+#line 9963 "Commands.c"
 	}
 }
 
@@ -9990,7 +9982,7 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->failed;
 #line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ > 0) {
-#line 9994 "Commands.c"
+#line 9986 "Commands.c"
 		gchar* error_string = NULL;
 		gint _tmp2_;
 		gint _tmp3_;
@@ -10010,7 +10002,7 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (error_string);
-#line 10014 "Commands.c"
+#line 10006 "Commands.c"
 	}
 }
 
@@ -10031,7 +10023,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
 #line 1115 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo = _tmp1_;
-#line 10035 "Commands.c"
+#line 10027 "Commands.c"
 	{
 		LibraryPhoto* dupe = NULL;
 		LibraryPhoto* _tmp2_;
@@ -10042,8 +10034,8 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		dupe = _tmp2_;
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10046 "Commands.c"
-			goto __catch458_g_error;
+#line 10038 "Commands.c"
+			goto __catch466_g_error;
 		}
 #line 1119 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->dupes;
@@ -10051,10 +10043,10 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, dupe);
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (dupe);
-#line 10055 "Commands.c"
+#line 10047 "Commands.c"
 	}
-	goto __finally458;
-	__catch458_g_error:
+	goto __finally466;
+	__catch466_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_;
@@ -10092,9 +10084,9 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		self->priv->failed = _tmp10_ + 1;
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_error_free0 (err);
-#line 10096 "Commands.c"
+#line 10088 "Commands.c"
 	}
-	__finally458:
+	__finally466:
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10105,11 +10097,11 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		g_clear_error (&_inner_error_);
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 10109 "Commands.c"
+#line 10101 "Commands.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 10113 "Commands.c"
+#line 10105 "Commands.c"
 }
 
 
@@ -10139,7 +10131,7 @@ static void duplicate_multiple_photos_command_real_undo (Command* base) {
 	_tmp3_ = library_photo_global;
 #line 1137 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
-#line 10143 "Commands.c"
+#line 10135 "Commands.c"
 }
 
 
@@ -10190,7 +10182,7 @@ static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataS
 	_g_object_unref0 (marker);
 #line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 10194 "Commands.c"
+#line 10186 "Commands.c"
 }
 
 
@@ -10209,7 +10201,7 @@ static void duplicate_multiple_photos_command_class_init (DuplicateMultiplePhoto
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = duplicate_multiple_photos_command_finalize;
-#line 10213 "Commands.c"
+#line 10205 "Commands.c"
 }
 
 
@@ -10223,7 +10215,7 @@ static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePh
 	self->priv->dupes = _tmp0_;
 #line 1082 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->failed = 0;
-#line 10227 "Commands.c"
+#line 10219 "Commands.c"
 }
 
 
@@ -10243,7 +10235,7 @@ static void duplicate_multiple_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->dupes);
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (duplicate_multiple_photos_command_parent_class)->finalize (obj);
-#line 10247 "Commands.c"
+#line 10239 "Commands.c"
 }
 
 
@@ -10291,14 +10283,14 @@ SetRatingSingleCommand* set_rating_single_command_construct (GType object_type,
 	self->priv->last_rating = _tmp5_;
 #line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10295 "Commands.c"
+#line 10287 "Commands.c"
 }
 
 
 SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating) {
 #line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_single_command_construct (TYPE_SET_RATING_SINGLE_COMMAND, source, rating);
-#line 10302 "Commands.c"
+#line 10294 "Commands.c"
 }
 
 
@@ -10318,11 +10310,11 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
 	if (_tmp1_) {
 #line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10322 "Commands.c"
+#line 10314 "Commands.c"
 	} else {
 #line 1164 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10326 "Commands.c"
+#line 10318 "Commands.c"
 	}
 #line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = source;
@@ -10342,14 +10334,14 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
 	self->priv->last_rating = _tmp5_;
 #line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10346 "Commands.c"
+#line 10338 "Commands.c"
 }
 
 
 SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing) {
 #line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_single_command_construct_inc_dec (TYPE_SET_RATING_SINGLE_COMMAND, source, is_incrementing);
-#line 10353 "Commands.c"
+#line 10345 "Commands.c"
 }
 
 
@@ -10362,7 +10354,7 @@ static void set_rating_single_command_real_execute (Command* base) {
 	_tmp0_ = self->priv->set_direct;
 #line 1172 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 10366 "Commands.c"
+#line 10358 "Commands.c"
 		DataSource* _tmp1_;
 		Rating _tmp2_;
 #line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10371,27 +10363,27 @@ static void set_rating_single_command_real_execute (Command* base) {
 		_tmp2_ = self->priv->new_rating;
 #line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10375 "Commands.c"
+#line 10367 "Commands.c"
 	} else {
 		gboolean _tmp3_;
 #line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->incrementing;
 #line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 10382 "Commands.c"
+#line 10374 "Commands.c"
 			DataSource* _tmp4_;
 #line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
 #line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10388 "Commands.c"
+#line 10380 "Commands.c"
 		} else {
 			DataSource* _tmp5_;
 #line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
 #line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10395 "Commands.c"
+#line 10387 "Commands.c"
 		}
 	}
 }
@@ -10409,7 +10401,7 @@ static void set_rating_single_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->last_rating;
 #line 1183 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 10413 "Commands.c"
+#line 10405 "Commands.c"
 }
 
 
@@ -10424,14 +10416,14 @@ static void set_rating_single_command_class_init (SetRatingSingleCommandClass *
 	((CommandClass *) klass)->undo = (void (*) (Command *)) set_rating_single_command_real_undo;
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_rating_single_command_finalize;
-#line 10428 "Commands.c"
+#line 10420 "Commands.c"
 }
 
 
 static void set_rating_single_command_instance_init (SetRatingSingleCommand * self) {
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_RATING_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 10435 "Commands.c"
+#line 10427 "Commands.c"
 }
 
 
@@ -10441,7 +10433,7 @@ static void set_rating_single_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_rating_single_command_parent_class)->finalize (obj);
-#line 10445 "Commands.c"
+#line 10437 "Commands.c"
 }
 
 
@@ -10497,14 +10489,14 @@ SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable*
 	set_rating_command_save_source_states (self, _tmp7_);
 #line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10501 "Commands.c"
+#line 10493 "Commands.c"
 }
 
 
 SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating) {
 #line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_command_construct (TYPE_SET_RATING_COMMAND, iter, rating);
-#line 10508 "Commands.c"
+#line 10500 "Commands.c"
 }
 
 
@@ -10527,11 +10519,11 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	if (_tmp1_) {
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Increasing ratings");
-#line 10531 "Commands.c"
+#line 10523 "Commands.c"
 	} else {
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Decreasing ratings");
-#line 10535 "Commands.c"
+#line 10527 "Commands.c"
 	}
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = is_incrementing;
@@ -10539,11 +10531,11 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	if (_tmp3_) {
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Decreasing ratings");
-#line 10543 "Commands.c"
+#line 10535 "Commands.c"
 	} else {
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Increasing ratings");
-#line 10547 "Commands.c"
+#line 10539 "Commands.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = is_incrementing;
@@ -10551,11 +10543,11 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	if (_tmp5_) {
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10555 "Commands.c"
+#line 10547 "Commands.c"
 	} else {
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10559 "Commands.c"
+#line 10551 "Commands.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = iter;
@@ -10573,14 +10565,14 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	set_rating_command_save_source_states (self, _tmp8_);
 #line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10577 "Commands.c"
+#line 10569 "Commands.c"
 }
 
 
 SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing) {
 #line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_command_construct_inc_dec (TYPE_SET_RATING_COMMAND, iter, is_incrementing);
-#line 10584 "Commands.c"
+#line 10576 "Commands.c"
 }
 
 
@@ -10596,7 +10588,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 	_g_object_unref0 (self->priv->last_rating_map);
 #line 1216 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->last_rating_map = _tmp0_;
-#line 10600 "Commands.c"
+#line 10592 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp1_;
@@ -10609,7 +10601,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 		_view_it = _tmp2_;
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 10613 "Commands.c"
+#line 10605 "Commands.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			DataView* view = NULL;
@@ -10630,7 +10622,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 			if (!_tmp4_) {
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 10634 "Commands.c"
+#line 10626 "Commands.c"
 			}
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _view_it;
@@ -10658,11 +10650,11 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 			_g_object_unref0 (source);
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 10662 "Commands.c"
+#line 10654 "Commands.c"
 		}
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 10666 "Commands.c"
+#line 10658 "Commands.c"
 	}
 }
 
@@ -10675,7 +10667,7 @@ static void set_rating_command_real_execute (Command* base) {
 	self->priv->action_count = 0;
 #line 1226 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_rating_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10679 "Commands.c"
+#line 10671 "Commands.c"
 }
 
 
@@ -10687,7 +10679,7 @@ static void set_rating_command_real_undo (Command* base) {
 	self->priv->action_count = 0;
 #line 1231 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_rating_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10691 "Commands.c"
+#line 10683 "Commands.c"
 }
 
 
@@ -10702,7 +10694,7 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
 	_tmp0_ = self->priv->set_direct;
 #line 1235 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 10706 "Commands.c"
+#line 10698 "Commands.c"
 		DataSource* _tmp1_;
 		Rating _tmp2_;
 #line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10711,27 +10703,27 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
 		_tmp2_ = self->priv->new_rating;
 #line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10715 "Commands.c"
+#line 10707 "Commands.c"
 	} else {
 		gboolean _tmp3_;
 #line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->incrementing;
 #line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 10722 "Commands.c"
+#line 10714 "Commands.c"
 			DataSource* _tmp4_;
 #line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = source;
 #line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10728 "Commands.c"
+#line 10720 "Commands.c"
 		} else {
 			DataSource* _tmp5_;
 #line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = source;
 #line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10735 "Commands.c"
+#line 10727 "Commands.c"
 		}
 	}
 }
@@ -10757,7 +10749,7 @@ static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* b
 	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
 #line 1246 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), (Rating) ((gintptr) _tmp3_));
-#line 10761 "Commands.c"
+#line 10753 "Commands.c"
 }
 
 
@@ -10776,7 +10768,7 @@ static void set_rating_command_class_init (SetRatingCommandClass * klass) {
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_rating_command_real_undo_on_source;
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_rating_command_finalize;
-#line 10780 "Commands.c"
+#line 10772 "Commands.c"
 }
 
 
@@ -10785,7 +10777,7 @@ static void set_rating_command_instance_init (SetRatingCommand * self) {
 	self->priv = SET_RATING_COMMAND_GET_PRIVATE (self);
 #line 1192 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->action_count = 0;
-#line 10789 "Commands.c"
+#line 10781 "Commands.c"
 }
 
 
@@ -10797,7 +10789,7 @@ static void set_rating_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->last_rating_map);
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_rating_command_parent_class)->finalize (obj);
-#line 10801 "Commands.c"
+#line 10793 "Commands.c"
 }
 
 
@@ -10834,14 +10826,14 @@ SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type,
 	set_raw_developer_command_save_source_states (self, _tmp2_);
 #line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10838 "Commands.c"
+#line 10830 "Commands.c"
 }
 
 
 SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer) {
 #line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_raw_developer_command_construct (TYPE_SET_RAW_DEVELOPER_COMMAND, iter, developer);
-#line 10845 "Commands.c"
+#line 10837 "Commands.c"
 }
 
 
@@ -10864,7 +10856,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 	_g_object_unref0 (self->priv->last_transformation_map);
 #line 1264 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->last_transformation_map = _tmp1_;
-#line 10868 "Commands.c"
+#line 10860 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp2_;
@@ -10877,7 +10869,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 		_view_it = _tmp3_;
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 10881 "Commands.c"
+#line 10873 "Commands.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			DataView* view = NULL;
@@ -10897,7 +10889,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			if (!_tmp5_) {
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 10901 "Commands.c"
+#line 10893 "Commands.c"
 			}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _view_it;
@@ -10915,7 +10907,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			if (_tmp10_ == NULL) {
 #line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp9_);
-#line 10919 "Commands.c"
+#line 10911 "Commands.c"
 			}
 #line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
 			photo = _tmp10_;
@@ -10925,7 +10917,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			_tmp12_ = set_raw_developer_command_is_raw_photo (self, _tmp11_);
 #line 1268 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_) {
-#line 10929 "Commands.c"
+#line 10921 "Commands.c"
 				GeeHashMap* _tmp13_;
 				Photo* _tmp14_;
 				Photo* _tmp15_;
@@ -10959,17 +10951,17 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_, _tmp21_);
 #line 1270 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp21_);
-#line 10963 "Commands.c"
+#line 10955 "Commands.c"
 			}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (photo);
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 10969 "Commands.c"
+#line 10961 "Commands.c"
 		}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 10973 "Commands.c"
+#line 10965 "Commands.c"
 	}
 }
 
@@ -10980,7 +10972,7 @@ static void set_raw_developer_command_real_execute (Command* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1276 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_raw_developer_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10984 "Commands.c"
+#line 10976 "Commands.c"
 }
 
 
@@ -10990,7 +10982,7 @@ static void set_raw_developer_command_real_undo (Command* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1280 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_raw_developer_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10994 "Commands.c"
+#line 10986 "Commands.c"
 }
 
 
@@ -11017,14 +11009,14 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
 	_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
 #line 1285 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 11021 "Commands.c"
+#line 11013 "Commands.c"
 		gboolean _tmp4_ = FALSE;
 		RawDeveloper _tmp5_;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = self->priv->new_developer;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp5_ == RAW_DEVELOPER_CAMERA) {
-#line 11028 "Commands.c"
+#line 11020 "Commands.c"
 			Photo* _tmp6_;
 			gboolean _tmp7_;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11033,21 +11025,21 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
 			_tmp7_ = photo_is_raw_developer_available (_tmp6_, RAW_DEVELOPER_CAMERA);
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = !_tmp7_;
-#line 11037 "Commands.c"
+#line 11029 "Commands.c"
 		} else {
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = FALSE;
-#line 11041 "Commands.c"
+#line 11033 "Commands.c"
 		}
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp4_) {
-#line 11045 "Commands.c"
+#line 11037 "Commands.c"
 			Photo* _tmp8_;
 #line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = photo;
 #line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
-			photo_set_raw_developer (_tmp8_, RAW_DEVELOPER_EMBEDDED);
-#line 11051 "Commands.c"
+			photo_set_raw_developer (_tmp8_, RAW_DEVELOPER_EMBEDDED, TRUE);
+#line 11043 "Commands.c"
 		} else {
 			Photo* _tmp9_;
 			RawDeveloper _tmp10_;
@@ -11056,13 +11048,13 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
 #line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = self->priv->new_developer;
 #line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
-			photo_set_raw_developer (_tmp9_, _tmp10_);
-#line 11061 "Commands.c"
+			photo_set_raw_developer (_tmp9_, _tmp10_, TRUE);
+#line 11053 "Commands.c"
 		}
 	}
 #line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 11066 "Commands.c"
+#line 11058 "Commands.c"
 }
 
 
@@ -11089,7 +11081,7 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 	_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
 #line 1295 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 11093 "Commands.c"
+#line 11085 "Commands.c"
 		Photo* _tmp4_;
 		GeeHashMap* _tmp5_;
 		Photo* _tmp6_;
@@ -11108,7 +11100,7 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 #line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
 #line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
-		photo_set_raw_developer (_tmp4_, (RawDeveloper) ((gintptr) _tmp7_));
+		photo_set_raw_developer (_tmp4_, (RawDeveloper) ((gintptr) _tmp7_), TRUE);
 #line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = photo;
 #line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11123,11 +11115,11 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 		photo_load_transformation_state (_tmp8_, _tmp12_);
 #line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp12_);
-#line 11127 "Commands.c"
+#line 11119 "Commands.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 11131 "Commands.c"
+#line 11123 "Commands.c"
 }
 
 
@@ -11143,7 +11135,7 @@ static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand*
 	_tmp1_ = photo;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ != NULL) {
-#line 11147 "Commands.c"
+#line 11139 "Commands.c"
 		Photo* _tmp2_;
 		PhotoFileFormat _tmp3_;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11152,17 +11144,17 @@ static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand*
 		_tmp3_ = photo_get_master_file_format (_tmp2_);
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _tmp3_ == PHOTO_FILE_FORMAT_RAW;
-#line 11156 "Commands.c"
+#line 11148 "Commands.c"
 	} else {
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 11160 "Commands.c"
+#line 11152 "Commands.c"
 	}
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = _tmp0_;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 11166 "Commands.c"
+#line 11158 "Commands.c"
 }
 
 
@@ -11181,14 +11173,14 @@ static void set_raw_developer_command_class_init (SetRawDeveloperCommandClass *
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_raw_developer_command_real_undo_on_source;
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_raw_developer_command_finalize;
-#line 11185 "Commands.c"
+#line 11177 "Commands.c"
 }
 
 
 static void set_raw_developer_command_instance_init (SetRawDeveloperCommand * self) {
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE (self);
-#line 11192 "Commands.c"
+#line 11184 "Commands.c"
 }
 
 
@@ -11202,7 +11194,7 @@ static void set_raw_developer_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->last_transformation_map);
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_raw_developer_command_parent_class)->finalize (obj);
-#line 11206 "Commands.c"
+#line 11198 "Commands.c"
 }
 
 
@@ -11249,14 +11241,14 @@ AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType obje
 	self->priv->modify_original = _tmp4_;
 #line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 11253 "Commands.c"
+#line 11245 "Commands.c"
 }
 
 
 AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original) {
 #line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_date_time_photo_command_construct (TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, dateable, time_shift, modify_original);
-#line 11260 "Commands.c"
+#line 11252 "Commands.c"
 }
 
 
@@ -11296,7 +11288,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 	_tmp6_ = view_collection_new ("tmp");
 #line 1325 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp6_;
-#line 11300 "Commands.c"
+#line 11292 "Commands.c"
 	{
 		GeeIterator* _dobj_it = NULL;
 		EventSourceCollection* _tmp7_;
@@ -11320,7 +11312,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 		_dobj_it = _tmp11_;
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11324 "Commands.c"
+#line 11316 "Commands.c"
 			GeeIterator* _tmp12_;
 			gboolean _tmp13_;
 			DataObject* dobj = NULL;
@@ -11338,7 +11330,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 			if (!_tmp13_) {
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11342 "Commands.c"
+#line 11334 "Commands.c"
 			}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp14_ = _dobj_it;
@@ -11356,7 +11348,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 			_tmp18_ = event;
 #line 1329 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp18_ != NULL) {
-#line 11360 "Commands.c"
+#line 11352 "Commands.c"
 				ViewCollection* _tmp19_;
 				Event* _tmp20_;
 				EventView* _tmp21_;
@@ -11373,17 +11365,17 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
 #line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp22_);
-#line 11377 "Commands.c"
+#line 11369 "Commands.c"
 			}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (dobj);
-#line 11383 "Commands.c"
+#line 11375 "Commands.c"
 		}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_dobj_it);
-#line 11387 "Commands.c"
+#line 11379 "Commands.c"
 	}
 #line 1333 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp23_ = self->priv->dateable;
@@ -11393,7 +11385,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 	event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource), _tmp24_, NULL);
 #line 1320 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (all_events);
-#line 11397 "Commands.c"
+#line 11389 "Commands.c"
 }
 
 
@@ -11423,7 +11415,7 @@ static void adjust_date_time_photo_command_real_undo (Command* base) {
 	_tmp5_ = self->priv->prev_event;
 #line 1339 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp5_);
-#line 11427 "Commands.c"
+#line 11419 "Commands.c"
 }
 
 
@@ -11439,21 +11431,21 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 	_tmp1_ = self->priv->modify_original;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 11443 "Commands.c"
+#line 11435 "Commands.c"
 		Dateable* _tmp2_;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = dateable;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 11449 "Commands.c"
+#line 11441 "Commands.c"
 	} else {
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 11453 "Commands.c"
+#line 11445 "Commands.c"
 	}
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 11457 "Commands.c"
+#line 11449 "Commands.c"
 		{
 			Dateable* _tmp3_;
 			time_t _tmp4_;
@@ -11465,12 +11457,12 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11469 "Commands.c"
-				goto __catch459_g_error;
+#line 11461 "Commands.c"
+				goto __catch467_g_error;
 			}
 		}
-		goto __finally459;
-		__catch459_g_error:
+		goto __finally467;
+		__catch467_g_error:
 		{
 			GError* err = NULL;
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11481,9 +11473,9 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			app_window_error_message (_ ("Original photo could not be adjusted."), NULL);
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_error_free0 (err);
-#line 11485 "Commands.c"
+#line 11477 "Commands.c"
 		}
-		__finally459:
+		__finally467:
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11492,7 +11484,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			g_clear_error (&_inner_error_);
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 11496 "Commands.c"
+#line 11488 "Commands.c"
 		}
 	} else {
 		Dateable* _tmp5_;
@@ -11503,7 +11495,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 		_tmp6_ = exposure_time;
 #line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
 		dateable_set_exposure_time (_tmp5_, _tmp6_);
-#line 11507 "Commands.c"
+#line 11499 "Commands.c"
 	}
 }
 
@@ -11519,14 +11511,14 @@ static void adjust_date_time_photo_command_class_init (AdjustDateTimePhotoComman
 	((CommandClass *) klass)->undo = (void (*) (Command *)) adjust_date_time_photo_command_real_undo;
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photo_command_finalize;
-#line 11523 "Commands.c"
+#line 11515 "Commands.c"
 }
 
 
 static void adjust_date_time_photo_command_instance_init (AdjustDateTimePhotoCommand * self) {
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 11530 "Commands.c"
+#line 11522 "Commands.c"
 }
 
 
@@ -11540,7 +11532,7 @@ static void adjust_date_time_photo_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->prev_event);
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_date_time_photo_command_parent_class)->finalize (obj);
-#line 11544 "Commands.c"
+#line 11536 "Commands.c"
 }
 
 
@@ -11564,14 +11556,14 @@ static time_t* _time_t_dup (time_t* self) {
 	memcpy (dup, self, sizeof (time_t));
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
 	return dup;
-#line 11568 "Commands.c"
+#line 11560 "Commands.c"
 }
 
 
 static gpointer __time_t_dup0 (gpointer self) {
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? _time_t_dup (self) : NULL;
-#line 11575 "Commands.c"
+#line 11567 "Commands.c"
 }
 
 
@@ -11607,7 +11599,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 	_g_object_unref0 (self->priv->prev_events);
 #line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MAP, GeeMap);
-#line 11611 "Commands.c"
+#line 11603 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp5_;
@@ -11620,7 +11612,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 		_view_it = _tmp6_;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11624 "Commands.c"
+#line 11616 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			DataView* view = NULL;
@@ -11646,7 +11638,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			if (!_tmp8_) {
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11650 "Commands.c"
+#line 11642 "Commands.c"
 			}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _view_it;
@@ -11666,7 +11658,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			if (_tmp14_ == NULL) {
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp13_);
-#line 11670 "Commands.c"
+#line 11662 "Commands.c"
 			}
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = _tmp14_;
@@ -11680,7 +11672,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			if (_tmp18_ == NULL) {
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp17_);
-#line 11684 "Commands.c"
+#line 11676 "Commands.c"
 			}
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp19_ = _tmp18_;
@@ -11700,7 +11692,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			_tmp22_ = self->priv->new_time;
 #line 1383 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp22_ == NULL) {
-#line 11704 "Commands.c"
+#line 11696 "Commands.c"
 				DataView* _tmp23_;
 				DataSource* _tmp24_;
 				Dateable* _tmp25_;
@@ -11732,15 +11724,15 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 				_g_object_unref0 (view);
 #line 1386 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11736 "Commands.c"
+#line 11728 "Commands.c"
 			}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 11740 "Commands.c"
+#line 11732 "Commands.c"
 		}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 11744 "Commands.c"
+#line 11736 "Commands.c"
 	}
 #line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -11750,14 +11742,14 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 	self->priv->old_times = _tmp30_;
 #line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 11754 "Commands.c"
+#line 11746 "Commands.c"
 }
 
 
 AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) {
 #line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_date_time_photos_command_construct (TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, iter, time_shift, keep_relativity, modify_originals);
-#line 11761 "Commands.c"
+#line 11753 "Commands.c"
 }
 
 
@@ -11787,7 +11779,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 	_tmp3_ = _tmp2_;
 #line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ > 0) {
-#line 11791 "Commands.c"
+#line 11783 "Commands.c"
 		GeeArrayList* _tmp4_;
 		GeeArrayList* _tmp5_;
 		gint _tmp6_;
@@ -11802,13 +11794,13 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 		_tmp7_ = _tmp6_;
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
 		multiple_object_error_dialog (_tmp4_, ngettext ("One original photo could not be adjusted.", "The following original photos could not be adjusted.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
-#line 11806 "Commands.c"
+#line 11798 "Commands.c"
 	}
 #line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = view_collection_new ("tmp");
 #line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp8_;
-#line 11812 "Commands.c"
+#line 11804 "Commands.c"
 	{
 		GeeIterator* _d_it = NULL;
 		GeeMap* _tmp9_;
@@ -11835,7 +11827,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 		_d_it = _tmp14_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11839 "Commands.c"
+#line 11831 "Commands.c"
 			GeeIterator* _tmp15_;
 			gboolean _tmp16_;
 			Dateable* d = NULL;
@@ -11851,7 +11843,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 			if (!_tmp16_) {
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11855 "Commands.c"
+#line 11847 "Commands.c"
 			}
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp17_ = _d_it;
@@ -11859,7 +11851,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 			_tmp18_ = gee_iterator_get (_tmp17_);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 			d = (Dateable*) _tmp18_;
-#line 11863 "Commands.c"
+#line 11855 "Commands.c"
 			{
 				GeeIterator* _dobj_it = NULL;
 				EventSourceCollection* _tmp19_;
@@ -11883,7 +11875,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 				_dobj_it = _tmp23_;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 11887 "Commands.c"
+#line 11879 "Commands.c"
 					GeeIterator* _tmp24_;
 					gboolean _tmp25_;
 					DataObject* dobj = NULL;
@@ -11901,7 +11893,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 					if (!_tmp25_) {
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 11905 "Commands.c"
+#line 11897 "Commands.c"
 					}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp26_ = _dobj_it;
@@ -11919,7 +11911,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 					_tmp30_ = event;
 #line 1409 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp30_ != NULL) {
-#line 11923 "Commands.c"
+#line 11915 "Commands.c"
 						ViewCollection* _tmp31_;
 						Event* _tmp32_;
 						EventView* _tmp33_;
@@ -11936,17 +11928,17 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 						data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject));
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp34_);
-#line 11940 "Commands.c"
+#line 11932 "Commands.c"
 					}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (event);
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (dobj);
-#line 11946 "Commands.c"
+#line 11938 "Commands.c"
 				}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_dobj_it);
-#line 11950 "Commands.c"
+#line 11942 "Commands.c"
 			}
 #line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp35_ = d;
@@ -11956,15 +11948,15 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource), _tmp36_, NULL);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (d);
-#line 11960 "Commands.c"
+#line 11952 "Commands.c"
 		}
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_d_it);
-#line 11964 "Commands.c"
+#line 11956 "Commands.c"
 	}
 #line 1393 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (all_events);
-#line 11968 "Commands.c"
+#line 11960 "Commands.c"
 }
 
 
@@ -11992,7 +11984,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 	_tmp3_ = _tmp2_;
 #line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ > 0) {
-#line 11996 "Commands.c"
+#line 11988 "Commands.c"
 		GeeArrayList* _tmp4_;
 		GeeArrayList* _tmp5_;
 		gint _tmp6_;
@@ -12007,7 +11999,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 		_tmp7_ = _tmp6_;
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
 		multiple_object_error_dialog (_tmp4_, ngettext ("Time adjustments could not be undone on the following photo file.", "Time adjustments could not be undone on the following photo files.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
-#line 12011 "Commands.c"
+#line 12003 "Commands.c"
 	}
 }
 
@@ -12024,21 +12016,21 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 	_tmp1_ = self->priv->modify_originals;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 12028 "Commands.c"
+#line 12020 "Commands.c"
 		Dateable* _tmp2_;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = dateable;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 12034 "Commands.c"
+#line 12026 "Commands.c"
 	} else {
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 12038 "Commands.c"
+#line 12030 "Commands.c"
 	}
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 12042 "Commands.c"
+#line 12034 "Commands.c"
 		{
 			Dateable* _tmp3_;
 			time_t _tmp4_;
@@ -12050,12 +12042,12 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12054 "Commands.c"
-				goto __catch460_g_error;
+#line 12046 "Commands.c"
+				goto __catch468_g_error;
 			}
 		}
-		goto __finally460;
-		__catch460_g_error:
+		goto __finally468;
+		__catch468_g_error:
 		{
 			GError* err = NULL;
 			GeeArrayList* _tmp5_;
@@ -12072,9 +12064,9 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_error_free0 (err);
-#line 12076 "Commands.c"
+#line 12068 "Commands.c"
 		}
-		__finally460:
+		__finally468:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12083,7 +12075,7 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			g_clear_error (&_inner_error_);
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 12087 "Commands.c"
+#line 12079 "Commands.c"
 		}
 	} else {
 		Dateable* _tmp7_;
@@ -12094,7 +12086,7 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 		_tmp8_ = exposure_time;
 #line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
 		dateable_set_exposure_time (_tmp7_, _tmp8_);
-#line 12098 "Commands.c"
+#line 12090 "Commands.c"
 	}
 }
 
@@ -12124,7 +12116,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 	_tmp3_ = self->priv->keep_relativity;
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 12128 "Commands.c"
+#line 12120 "Commands.c"
 		Dateable* _tmp4_;
 		time_t _tmp5_;
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12133,15 +12125,15 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp5_ = dateable_get_exposure_time (_tmp4_);
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_ != ((time_t) 0);
-#line 12137 "Commands.c"
+#line 12129 "Commands.c"
 	} else {
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = FALSE;
-#line 12141 "Commands.c"
+#line 12133 "Commands.c"
 	}
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_) {
-#line 12145 "Commands.c"
+#line 12137 "Commands.c"
 		Dateable* _tmp6_;
 		Dateable* _tmp7_;
 		time_t _tmp8_;
@@ -12156,7 +12148,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp9_ = self->priv->time_shift;
 #line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp6_, _tmp8_ + ((time_t) _tmp9_));
-#line 12160 "Commands.c"
+#line 12152 "Commands.c"
 	} else {
 		GeeHashMap* _tmp10_;
 		Dateable* _tmp11_;
@@ -12180,13 +12172,13 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp15_ = self->priv->new_time;
 #line 1453 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp14_, *_tmp15_);
-#line 12184 "Commands.c"
+#line 12176 "Commands.c"
 	}
 #line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = view_collection_new ("tmp");
 #line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp16_;
-#line 12190 "Commands.c"
+#line 12182 "Commands.c"
 	{
 		GeeIterator* _dobj_it = NULL;
 		EventSourceCollection* _tmp17_;
@@ -12210,7 +12202,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_dobj_it = _tmp21_;
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12214 "Commands.c"
+#line 12206 "Commands.c"
 			GeeIterator* _tmp22_;
 			gboolean _tmp23_;
 			DataObject* dobj = NULL;
@@ -12228,7 +12220,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 			if (!_tmp23_) {
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12232 "Commands.c"
+#line 12224 "Commands.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp24_ = _dobj_it;
@@ -12246,7 +12238,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 			_tmp28_ = event;
 #line 1460 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp28_ != NULL) {
-#line 12250 "Commands.c"
+#line 12242 "Commands.c"
 				ViewCollection* _tmp29_;
 				Event* _tmp30_;
 				EventView* _tmp31_;
@@ -12263,17 +12255,17 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
 #line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp32_);
-#line 12267 "Commands.c"
+#line 12259 "Commands.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (dobj);
-#line 12273 "Commands.c"
+#line 12265 "Commands.c"
 		}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_dobj_it);
-#line 12277 "Commands.c"
+#line 12269 "Commands.c"
 	}
 #line 1464 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp33_ = dateable;
@@ -12285,7 +12277,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 	_data_collection_unref0 (all_events);
 #line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dateable);
-#line 12289 "Commands.c"
+#line 12281 "Commands.c"
 }
 
 
@@ -12320,7 +12312,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 	_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
 #line 1470 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 12324 "Commands.c"
+#line 12316 "Commands.c"
 		Dateable* _tmp5_;
 		GeeHashMap* _tmp6_;
 		Dateable* _tmp7_;
@@ -12348,7 +12340,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 		_tmp11_ = photo;
 #line 1472 "/home/jens/Source/shotwell/src/Commands.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 12352 "Commands.c"
+#line 12344 "Commands.c"
 	} else {
 		Dateable* _tmp12_;
 		Dateable* _tmp13_;
@@ -12364,7 +12356,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 		_tmp15_ = self->priv->time_shift;
 #line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp12_, _tmp14_ - ((time_t) _tmp15_));
-#line 12368 "Commands.c"
+#line 12360 "Commands.c"
 	}
 #line 1477 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = source;
@@ -12382,7 +12374,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 	_g_object_unref0 (_tmp20_);
 #line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 12386 "Commands.c"
+#line 12378 "Commands.c"
 }
 
 
@@ -12401,7 +12393,7 @@ static void adjust_date_time_photos_command_class_init (AdjustDateTimePhotosComm
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_date_time_photos_command_real_undo_on_source;
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photos_command_finalize;
-#line 12405 "Commands.c"
+#line 12397 "Commands.c"
 }
 
 
@@ -12410,7 +12402,7 @@ static void adjust_date_time_photos_command_instance_init (AdjustDateTimePhotosC
 	self->priv = ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE (self);
 #line 1362 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->new_time = NULL;
-#line 12414 "Commands.c"
+#line 12406 "Commands.c"
 }
 
 
@@ -12428,7 +12420,7 @@ static void adjust_date_time_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->error_list);
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_date_time_photos_command_parent_class)->finalize (obj);
-#line 12432 "Commands.c"
+#line 12424 "Commands.c"
 }
 
 
@@ -12447,14 +12439,14 @@ GType adjust_date_time_photos_command_get_type (void) {
 static void _add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 1521 "/home/jens/Source/shotwell/src/Commands.vala"
 	add_tags_command_on_proxy_broken ((AddTagsCommand*) self);
-#line 12451 "Commands.c"
+#line 12443 "Commands.c"
 }
 
 
 static void _add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
 	add_tags_command_on_source_destroyed ((AddTagsCommand*) self, source);
-#line 12458 "Commands.c"
+#line 12450 "Commands.c"
 }
 
 
@@ -12486,7 +12478,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 	_tmp3_ = paths;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3__length1 = paths_length1;
-#line 12490 "Commands.c"
+#line 12482 "Commands.c"
 	{
 		gchar** path_collection = NULL;
 		gint path_collection_length1 = 0;
@@ -12498,14 +12490,14 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 		path_collection_length1 = _tmp3__length1;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 		for (path_it = 0; path_it < _tmp3__length1; path_it = path_it + 1) {
-#line 12502 "Commands.c"
+#line 12494 "Commands.c"
 			gchar* _tmp4_;
 			gchar* path = NULL;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = g_strdup (path_collection[path_it]);
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 			path = _tmp4_;
-#line 12509 "Commands.c"
+#line 12501 "Commands.c"
 			{
 				GeeList* paths_to_create = NULL;
 				const gchar* _tmp5_;
@@ -12524,7 +12516,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 				_tmp8_ = path;
 #line 1494 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
-#line 12528 "Commands.c"
+#line 12520 "Commands.c"
 				{
 					GeeList* _create_path_list = NULL;
 					GeeList* _tmp9_;
@@ -12552,7 +12544,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 					_create_path_index = -1;
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 12556 "Commands.c"
+#line 12548 "Commands.c"
 						gint _tmp14_;
 						gint _tmp15_;
 						gint _tmp16_;
@@ -12583,7 +12575,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						if (!(_tmp15_ < _tmp16_)) {
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 12587 "Commands.c"
+#line 12579 "Commands.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp17_ = _create_path_list;
@@ -12609,7 +12601,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1502 "/home/jens/Source/shotwell/src/Commands.vala"
 						add_sources = _tmp24_;
-#line 12613 "Commands.c"
+#line 12605 "Commands.c"
 						{
 							GeeIterator* _source_it = NULL;
 							GeeCollection* _tmp25_;
@@ -12622,7 +12614,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 							_source_it = _tmp26_;
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 							while (TRUE) {
-#line 12626 "Commands.c"
+#line 12618 "Commands.c"
 								GeeIterator* _tmp27_;
 								gboolean _tmp28_;
 								MediaSource* source = NULL;
@@ -12639,7 +12631,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 								if (!_tmp28_) {
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 									break;
-#line 12643 "Commands.c"
+#line 12635 "Commands.c"
 								}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 								_tmp29_ = _source_it;
@@ -12655,7 +12647,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 								_tmp33_ = tag_contains (_tmp31_, _tmp32_);
 #line 1504 "/home/jens/Source/shotwell/src/Commands.vala"
 								if (!_tmp33_) {
-#line 12659 "Commands.c"
+#line 12651 "Commands.c"
 									GeeArrayList* _tmp34_;
 									MediaSource* _tmp35_;
 #line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12664,15 +12656,15 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 									_tmp35_ = source;
 #line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
 									gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 12668 "Commands.c"
+#line 12660 "Commands.c"
 								}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 								_g_object_unref0 (source);
-#line 12672 "Commands.c"
+#line 12664 "Commands.c"
 							}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_source_it);
-#line 12676 "Commands.c"
+#line 12668 "Commands.c"
 						}
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp36_ = add_sources;
@@ -12682,7 +12674,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_tmp38_ = _tmp37_;
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp38_ > 0) {
-#line 12686 "Commands.c"
+#line 12678 "Commands.c"
 							SourceProxy* _tmp39_;
 							GeeHashMap* _tmp40_;
 							SourceProxy* _tmp41_;
@@ -12699,7 +12691,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 							_tmp42_ = add_sources;
 #line 1510 "/home/jens/Source/shotwell/src/Commands.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, _tmp42_);
-#line 12703 "Commands.c"
+#line 12695 "Commands.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (add_sources);
@@ -12709,17 +12701,17 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_g_object_unref0 (tag);
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_free0 (create_path);
-#line 12713 "Commands.c"
+#line 12705 "Commands.c"
 					}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_create_path_list);
-#line 12717 "Commands.c"
+#line 12709 "Commands.c"
 				}
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (paths_to_create);
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (path);
-#line 12723 "Commands.c"
+#line 12715 "Commands.c"
 			}
 		}
 	}
@@ -12733,14 +12725,14 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0);
 #line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 12737 "Commands.c"
+#line 12729 "Commands.c"
 }
 
 
 AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources) {
 #line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
 	return add_tags_command_construct (TYPE_ADD_TAGS_COMMAND, paths, paths_length1, sources);
-#line 12744 "Commands.c"
+#line 12736 "Commands.c"
 }
 
 
@@ -12748,7 +12740,7 @@ static void add_tags_command_real_execute (Command* base) {
 	AddTagsCommand * self;
 #line 1527 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12752 "Commands.c"
+#line 12744 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -12775,7 +12767,7 @@ static void add_tags_command_real_execute (Command* base) {
 		_tag_proxy_it = _tmp5_;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12779 "Commands.c"
+#line 12771 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
@@ -12796,7 +12788,7 @@ static void add_tags_command_real_execute (Command* base) {
 			if (!_tmp7_) {
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12800 "Commands.c"
+#line 12792 "Commands.c"
 			}
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -12826,11 +12818,11 @@ static void add_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp12_);
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 12830 "Commands.c"
+#line 12822 "Commands.c"
 		}
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 12834 "Commands.c"
+#line 12826 "Commands.c"
 	}
 }
 
@@ -12839,7 +12831,7 @@ static void add_tags_command_real_undo (Command* base) {
 	AddTagsCommand * self;
 #line 1532 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12843 "Commands.c"
+#line 12835 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -12866,7 +12858,7 @@ static void add_tags_command_real_undo (Command* base) {
 		_tag_proxy_it = _tmp5_;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12870 "Commands.c"
+#line 12862 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
@@ -12890,7 +12882,7 @@ static void add_tags_command_real_undo (Command* base) {
 			if (!_tmp7_) {
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12894 "Commands.c"
+#line 12886 "Commands.c"
 			}
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -12926,11 +12918,11 @@ static void add_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (tag);
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 12930 "Commands.c"
+#line 12922 "Commands.c"
 		}
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 12934 "Commands.c"
+#line 12926 "Commands.c"
 	}
 }
 
@@ -12940,7 +12932,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 	g_return_if_fail (IS_ADD_TAGS_COMMAND (self));
 #line 1540 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 12944 "Commands.c"
+#line 12936 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -12967,7 +12959,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 		_sources_it = _tmp5_;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12971 "Commands.c"
+#line 12963 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			GeeArrayList* sources = NULL;
@@ -12984,7 +12976,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 			if (!_tmp7_) {
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12988 "Commands.c"
+#line 12980 "Commands.c"
 			}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _sources_it;
@@ -13000,7 +12992,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 			_tmp12_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1542 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_) {
-#line 13004 "Commands.c"
+#line 12996 "Commands.c"
 				CommandManager* _tmp13_;
 				CommandManager* _tmp14_;
 #line 1543 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13017,15 +13009,15 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 				_g_object_unref0 (_sources_it);
 #line 1545 "/home/jens/Source/shotwell/src/Commands.vala"
 				return;
-#line 13021 "Commands.c"
+#line 13013 "Commands.c"
 			}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (sources);
-#line 13025 "Commands.c"
+#line 13017 "Commands.c"
 		}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_sources_it);
-#line 13029 "Commands.c"
+#line 13021 "Commands.c"
 	}
 }
 
@@ -13043,7 +13035,7 @@ static void add_tags_command_on_proxy_broken (AddTagsCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 1551 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 13047 "Commands.c"
+#line 13039 "Commands.c"
 }
 
 
@@ -13058,7 +13050,7 @@ static void add_tags_command_class_init (AddTagsCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) add_tags_command_real_undo;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = add_tags_command_finalize;
-#line 13062 "Commands.c"
+#line 13054 "Commands.c"
 }
 
 
@@ -13070,7 +13062,7 @@ static void add_tags_command_instance_init (AddTagsCommand * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1482 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->map = _tmp0_;
-#line 13074 "Commands.c"
+#line 13066 "Commands.c"
 }
 
 
@@ -13082,7 +13074,7 @@ static void add_tags_command_finalize (GObject * obj) {
 	guint _tmp15_;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 13086 "Commands.c"
+#line 13078 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -13109,7 +13101,7 @@ static void add_tags_command_finalize (GObject * obj) {
 		_tag_proxy_it = _tmp5_;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 13113 "Commands.c"
+#line 13105 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
@@ -13125,7 +13117,7 @@ static void add_tags_command_finalize (GObject * obj) {
 			if (!_tmp7_) {
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 13129 "Commands.c"
+#line 13121 "Commands.c"
 			}
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -13141,11 +13133,11 @@ static void add_tags_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _add_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 13145 "Commands.c"
+#line 13137 "Commands.c"
 		}
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 13149 "Commands.c"
+#line 13141 "Commands.c"
 	}
 #line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp12_ = library_photo_global;
@@ -13163,7 +13155,7 @@ static void add_tags_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->map);
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (add_tags_command_parent_class)->finalize (obj);
-#line 13167 "Commands.c"
+#line 13159 "Commands.c"
 }
 
 
@@ -13245,14 +13237,14 @@ RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, con
 	self->priv->new_name = _tmp13_;
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13249 "Commands.c"
+#line 13241 "Commands.c"
 }
 
 
 RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name) {
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_tag_command_construct (TYPE_RENAME_TAG_COMMAND, tag, new_name);
-#line 13256 "Commands.c"
+#line 13248 "Commands.c"
 }
 
 
@@ -13273,7 +13265,7 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
 #line 1569 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 13277 "Commands.c"
+#line 13269 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -13287,7 +13279,7 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 		app_window_error_message (_tmp5_, NULL);
 #line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 13291 "Commands.c"
+#line 13283 "Commands.c"
 	}
 }
 
@@ -13309,7 +13301,7 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 	_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
 #line 1574 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 13313 "Commands.c"
+#line 13305 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -13323,7 +13315,7 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 		app_window_error_message (_tmp5_, NULL);
 #line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 13327 "Commands.c"
+#line 13319 "Commands.c"
 	}
 }
 
@@ -13339,14 +13331,14 @@ static void rename_tag_command_class_init (RenameTagCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_tag_command_real_undo_on_source;
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_tag_command_finalize;
-#line 13343 "Commands.c"
+#line 13335 "Commands.c"
 }
 
 
 static void rename_tag_command_instance_init (RenameTagCommand * self) {
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_TAG_COMMAND_GET_PRIVATE (self);
-#line 13350 "Commands.c"
+#line 13342 "Commands.c"
 }
 
 
@@ -13360,7 +13352,7 @@ static void rename_tag_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->new_name);
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_tag_command_parent_class)->finalize (obj);
-#line 13364 "Commands.c"
+#line 13356 "Commands.c"
 }
 
 
@@ -13417,21 +13409,21 @@ DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag) {
 	_g_free0 (_tmp3_);
 #line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13421 "Commands.c"
+#line 13413 "Commands.c"
 }
 
 
 DeleteTagCommand* delete_tag_command_new (Tag* tag) {
 #line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
 	return delete_tag_command_construct (TYPE_DELETE_TAG_COMMAND, tag);
-#line 13428 "Commands.c"
+#line 13420 "Commands.c"
 }
 
 
 static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 1597 "/home/jens/Source/shotwell/src/Commands.vala"
 	delete_tag_command_on_proxy_broken ((DeleteTagCommand*) self);
-#line 13435 "Commands.c"
+#line 13427 "Commands.c"
 }
 
 
@@ -13475,7 +13467,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_tmp6_ = _tmp5_;
 #line 1591 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ > 0) {
-#line 13479 "Commands.c"
+#line 13471 "Commands.c"
 		GeeArrayList* _tmp7_;
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
@@ -13483,7 +13475,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 		_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->recursive_victim_proxies = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
-#line 13487 "Commands.c"
+#line 13479 "Commands.c"
 		{
 			GeeList* _victim_list = NULL;
 			GeeList* _tmp8_;
@@ -13511,7 +13503,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 			_victim_index = -1;
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 13515 "Commands.c"
+#line 13507 "Commands.c"
 				gint _tmp13_;
 				gint _tmp14_;
 				gint _tmp15_;
@@ -13542,7 +13534,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 				if (!(_tmp14_ < _tmp15_)) {
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 13546 "Commands.c"
+#line 13538 "Commands.c"
 				}
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = _victim_list;
@@ -13586,11 +13578,11 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 				_source_proxy_unref0 (proxy);
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (victim);
-#line 13590 "Commands.c"
+#line 13582 "Commands.c"
 			}
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_victim_list);
-#line 13594 "Commands.c"
+#line 13586 "Commands.c"
 		}
 	}
 #line 1605 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13611,7 +13603,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_g_object_unref0 (recursive_victims);
 #line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
-#line 13615 "Commands.c"
+#line 13607 "Commands.c"
 }
 
 
@@ -13631,7 +13623,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 	_tmp1_ = self->priv->recursive_victim_proxies;
 #line 1614 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ != NULL) {
-#line 13635 "Commands.c"
+#line 13627 "Commands.c"
 		{
 			gint i = 0;
 			GeeList* _tmp2_;
@@ -13645,14 +13637,14 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 			_tmp4_ = _tmp3_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp4_ - 1;
-#line 13649 "Commands.c"
+#line 13641 "Commands.c"
 			{
 				gboolean _tmp5_ = FALSE;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp5_ = TRUE;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 13656 "Commands.c"
+#line 13648 "Commands.c"
 					gint _tmp7_;
 					SourceProxy* proxy = NULL;
 					GeeList* _tmp8_;
@@ -13666,13 +13658,13 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					guint _tmp15_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp5_) {
-#line 13670 "Commands.c"
+#line 13662 "Commands.c"
 						gint _tmp6_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp6_ = i;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp6_ - 1;
-#line 13676 "Commands.c"
+#line 13668 "Commands.c"
 					}
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp5_ = FALSE;
@@ -13682,7 +13674,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					if (!(_tmp7_ >= 0)) {
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 13686 "Commands.c"
+#line 13678 "Commands.c"
 					}
 #line 1616 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp8_ = self->priv->recursive_victim_proxies;
@@ -13712,7 +13704,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					_g_object_unref0 (victim_source);
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					_source_proxy_unref0 (proxy);
-#line 13716 "Commands.c"
+#line 13708 "Commands.c"
 				}
 			}
 		}
@@ -13720,7 +13712,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 		_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1624 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->recursive_victim_proxies = NULL;
-#line 13724 "Commands.c"
+#line 13716 "Commands.c"
 	}
 }
 
@@ -13738,7 +13730,7 @@ static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 1629 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 13742 "Commands.c"
+#line 13734 "Commands.c"
 }
 
 
@@ -13753,7 +13745,7 @@ static void delete_tag_command_class_init (DeleteTagCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) delete_tag_command_real_undo_on_source;
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = delete_tag_command_finalize;
-#line 13757 "Commands.c"
+#line 13749 "Commands.c"
 }
 
 
@@ -13762,7 +13754,7 @@ static void delete_tag_command_instance_init (DeleteTagCommand * self) {
 	self->priv = DELETE_TAG_COMMAND_GET_PRIVATE (self);
 #line 1580 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->recursive_victim_proxies = NULL;
-#line 13766 "Commands.c"
+#line 13758 "Commands.c"
 }
 
 
@@ -13774,7 +13766,7 @@ static void delete_tag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (delete_tag_command_parent_class)->finalize (obj);
-#line 13778 "Commands.c"
+#line 13770 "Commands.c"
 }
 
 
@@ -13812,14 +13804,14 @@ NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag
 	_g_free0 (_tmp3_);
 #line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13816 "Commands.c"
+#line 13808 "Commands.c"
 }
 
 
 NewChildTagCommand* new_child_tag_command_new (Tag* tag) {
 #line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_child_tag_command_construct (TYPE_NEW_CHILD_TAG_COMMAND, tag);
-#line 13823 "Commands.c"
+#line 13815 "Commands.c"
 }
 
 
@@ -13847,7 +13839,7 @@ static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand
 	self->priv->created_child = _tmp2_;
 #line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
-#line 13851 "Commands.c"
+#line 13843 "Commands.c"
 }
 
 
@@ -13876,7 +13868,7 @@ static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* b
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp4_, TRUE, NULL, NULL, NULL);
 #line 1646 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 13880 "Commands.c"
+#line 13872 "Commands.c"
 }
 
 
@@ -13899,7 +13891,7 @@ Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) {
 	result = _tmp2_;
 #line 1652 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 13903 "Commands.c"
+#line 13895 "Commands.c"
 }
 
 
@@ -13914,7 +13906,7 @@ static void new_child_tag_command_class_init (NewChildTagCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) new_child_tag_command_real_undo_on_source;
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = new_child_tag_command_finalize;
-#line 13918 "Commands.c"
+#line 13910 "Commands.c"
 }
 
 
@@ -13923,7 +13915,7 @@ static void new_child_tag_command_instance_init (NewChildTagCommand * self) {
 	self->priv = NEW_CHILD_TAG_COMMAND_GET_PRIVATE (self);
 #line 1634 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->created_child = NULL;
-#line 13927 "Commands.c"
+#line 13919 "Commands.c"
 }
 
 
@@ -13935,7 +13927,7 @@ static void new_child_tag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->created_child);
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (new_child_tag_command_parent_class)->finalize (obj);
-#line 13939 "Commands.c"
+#line 13931 "Commands.c"
 }
 
 
@@ -13957,14 +13949,14 @@ NewRootTagCommand* new_root_tag_command_construct (GType object_type) {
 	self = (NewRootTagCommand*) page_command_construct (object_type, _ ("Create Tag"), "");
 #line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13961 "Commands.c"
+#line 13953 "Commands.c"
 }
 
 
 NewRootTagCommand* new_root_tag_command_new (void) {
 #line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_root_tag_command_construct (TYPE_NEW_ROOT_TAG_COMMAND);
-#line 13968 "Commands.c"
+#line 13960 "Commands.c"
 }
 
 
@@ -13977,7 +13969,7 @@ static void new_root_tag_command_real_execute (Command* base) {
 	_tmp0_ = self->priv->created_proxy;
 #line 1664 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 13981 "Commands.c"
+#line 13973 "Commands.c"
 		Tag* _tmp1_;
 		Tag* _tmp2_;
 		SourceProxy* _tmp3_;
@@ -13993,7 +13985,7 @@ static void new_root_tag_command_real_execute (Command* base) {
 		self->priv->created_proxy = _tmp3_;
 #line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp2_);
-#line 13997 "Commands.c"
+#line 13989 "Commands.c"
 	} else {
 		SourceProxy* _tmp4_;
 		DataSource* _tmp5_;
@@ -14006,7 +13998,7 @@ static void new_root_tag_command_real_execute (Command* base) {
 		_tmp6_ = _tmp5_;
 #line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 14010 "Commands.c"
+#line 14002 "Commands.c"
 	}
 }
 
@@ -14042,7 +14034,7 @@ static void new_root_tag_command_real_undo (Command* base) {
 	_g_object_unref0 (_tmp6_);
 #line 1671 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 14046 "Commands.c"
+#line 14038 "Commands.c"
 }
 
 
@@ -14060,7 +14052,7 @@ Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag);
 #line 1675 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 14064 "Commands.c"
+#line 14056 "Commands.c"
 }
 
 
@@ -14075,7 +14067,7 @@ static void new_root_tag_command_class_init (NewRootTagCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) new_root_tag_command_real_undo;
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = new_root_tag_command_finalize;
-#line 14079 "Commands.c"
+#line 14071 "Commands.c"
 }
 
 
@@ -14084,7 +14076,7 @@ static void new_root_tag_command_instance_init (NewRootTagCommand * self) {
 	self->priv = NEW_ROOT_TAG_COMMAND_GET_PRIVATE (self);
 #line 1657 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->created_proxy = NULL;
-#line 14088 "Commands.c"
+#line 14080 "Commands.c"
 }
 
 
@@ -14096,7 +14088,7 @@ static void new_root_tag_command_finalize (GObject * obj) {
 	_source_proxy_unref0 (self->priv->created_proxy);
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (new_root_tag_command_parent_class)->finalize (obj);
-#line 14100 "Commands.c"
+#line 14092 "Commands.c"
 }
 
 
@@ -14115,7 +14107,7 @@ GType new_root_tag_command_get_type (void) {
 static void _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) {
 #line 1724 "/home/jens/Source/shotwell/src/Commands.vala"
 	reparent_tag_command_on_items_destroyed ((ReparentTagCommand*) self, destroyed);
-#line 14119 "Commands.c"
+#line 14111 "Commands.c"
 }
 
 
@@ -14206,7 +14198,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	_tmp15_ = new_parent_path;
 #line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (g_strcmp0 (_tmp15_, TAG_PATH_SEPARATOR_STRING) == 0) {
-#line 14210 "Commands.c"
+#line 14202 "Commands.c"
 		gchar* _tmp16_ = NULL;
 		gboolean _tmp17_;
 		gchar* _tmp22_;
@@ -14214,7 +14206,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		_tmp17_ = has_children;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp17_) {
-#line 14218 "Commands.c"
+#line 14210 "Commands.c"
 			const gchar* _tmp18_;
 			gchar* _tmp19_;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14225,7 +14217,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			_g_free0 (_tmp16_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _tmp19_;
-#line 14229 "Commands.c"
+#line 14221 "Commands.c"
 		} else {
 			const gchar* _tmp20_;
 			gchar* _tmp21_;
@@ -14237,7 +14229,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			_g_free0 (_tmp16_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _tmp21_;
-#line 14241 "Commands.c"
+#line 14233 "Commands.c"
 		}
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp22_ = g_strdup (_tmp16_);
@@ -14247,7 +14239,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		self->priv->to_path = _tmp22_;
 #line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp16_);
-#line 14251 "Commands.c"
+#line 14243 "Commands.c"
 	} else {
 		const gchar* _tmp23_;
 		gboolean _tmp24_;
@@ -14257,7 +14249,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		_tmp24_ = g_str_has_prefix (_tmp23_, TAG_PATH_SEPARATOR_STRING);
 #line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp24_) {
-#line 14261 "Commands.c"
+#line 14253 "Commands.c"
 			const gchar* _tmp25_;
 			gchar* _tmp26_;
 			gchar* _tmp27_;
@@ -14279,7 +14271,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			self->priv->to_path = _tmp29_;
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (_tmp27_);
-#line 14283 "Commands.c"
+#line 14275 "Commands.c"
 		} else {
 			const gchar* _tmp30_;
 			gchar* _tmp31_;
@@ -14310,7 +14302,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			_g_free0 (_tmp34_);
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (_tmp32_);
-#line 14314 "Commands.c"
+#line 14306 "Commands.c"
 		}
 	}
 #line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14323,7 +14315,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	_tmp39_ = new_to_path;
 #line 1711 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp39_ != NULL) {
-#line 14327 "Commands.c"
+#line 14319 "Commands.c"
 		const gchar* _tmp40_;
 		gchar* _tmp41_;
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14334,7 +14326,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		_g_free0 (self->priv->to_path);
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path = _tmp41_;
-#line 14338 "Commands.c"
+#line 14330 "Commands.c"
 	}
 #line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp42_ = tag_global;
@@ -14346,7 +14338,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	if (_tmp44_) {
 #line 1715 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path_exists = TRUE;
-#line 14350 "Commands.c"
+#line 14342 "Commands.c"
 	}
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp45_ = self->priv->sources_in_play;
@@ -14374,14 +14366,14 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	_g_free0 (basename);
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 14378 "Commands.c"
+#line 14370 "Commands.c"
 }
 
 
 ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path) {
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	return reparent_tag_command_construct (TYPE_REPARENT_TAG_COMMAND, tag, new_parent_path);
-#line 14385 "Commands.c"
+#line 14377 "Commands.c"
 }
 
 
@@ -14390,7 +14382,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1728 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 14394 "Commands.c"
+#line 14386 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -14403,7 +14395,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 		_source_it = _tmp1_;
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14407 "Commands.c"
+#line 14399 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -14420,7 +14412,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 			if (!_tmp3_) {
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14424 "Commands.c"
+#line 14416 "Commands.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -14436,7 +14428,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 			_tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1730 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_) {
-#line 14440 "Commands.c"
+#line 14432 "Commands.c"
 				CommandManager* _tmp9_;
 				CommandManager* _tmp10_;
 #line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14447,15 +14439,15 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 				command_manager_reset (_tmp10_);
 #line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
 				_command_manager_unref0 (_tmp10_);
-#line 14451 "Commands.c"
+#line 14443 "Commands.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 14455 "Commands.c"
+#line 14447 "Commands.c"
 		}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 14459 "Commands.c"
+#line 14451 "Commands.c"
 	}
 }
 
@@ -14475,20 +14467,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 14479 "Commands.c"
+#line 14471 "Commands.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 14486 "Commands.c"
+#line 14478 "Commands.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 14492 "Commands.c"
+#line 14484 "Commands.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -14498,11 +14490,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 14502 "Commands.c"
+#line 14494 "Commands.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 14506 "Commands.c"
+#line 14498 "Commands.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -14510,7 +14502,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 14514 "Commands.c"
+#line 14506 "Commands.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -14542,8 +14534,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14546 "Commands.c"
-				goto __catch461_g_regex_error;
+#line 14538 "Commands.c"
+				goto __catch469_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -14551,7 +14543,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 14555 "Commands.c"
+#line 14547 "Commands.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -14567,8 +14559,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14571 "Commands.c"
-				goto __catch461_g_regex_error;
+#line 14563 "Commands.c"
+				goto __catch469_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -14578,7 +14570,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 14582 "Commands.c"
+#line 14574 "Commands.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -14592,10 +14584,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 14596 "Commands.c"
+#line 14588 "Commands.c"
 	}
-	goto __finally461;
-	__catch461_g_regex_error:
+	goto __finally469;
+	__catch469_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -14606,9 +14598,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 14610 "Commands.c"
+#line 14602 "Commands.c"
 	}
-	__finally461:
+	__finally469:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -14617,7 +14609,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 14621 "Commands.c"
+#line 14613 "Commands.c"
 	}
 }
 
@@ -14658,20 +14650,20 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_tmp3_ = path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 14662 "Commands.c"
+#line 14654 "Commands.c"
 		const gchar* _tmp4_;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 14668 "Commands.c"
+#line 14660 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 14675 "Commands.c"
+#line 14667 "Commands.c"
 	}
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -14697,7 +14689,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 		_g_free0 (path);
 #line 1743 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 14701 "Commands.c"
+#line 14693 "Commands.c"
 	}
 #line 1745 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = path;
@@ -14719,7 +14711,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_g_free0 (_tmp15_);
 #line 1747 "/home/jens/Source/shotwell/src/Commands.vala"
 	path_prefix = _tmp17_;
-#line 14723 "Commands.c"
+#line 14715 "Commands.c"
 	{
 		GeeList* _t_list = NULL;
 		Tag* _tmp18_;
@@ -14747,7 +14739,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 		_t_index = -1;
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14751 "Commands.c"
+#line 14743 "Commands.c"
 			gint _tmp23_;
 			gint _tmp24_;
 			gint _tmp25_;
@@ -14785,7 +14777,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 			if (!(_tmp24_ < _tmp25_)) {
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14789 "Commands.c"
+#line 14781 "Commands.c"
 			}
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = _t_list;
@@ -14847,11 +14839,11 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 			_g_free0 (child_subpath);
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (t);
-#line 14851 "Commands.c"
+#line 14843 "Commands.c"
 		}
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_t_list);
-#line 14855 "Commands.c"
+#line 14847 "Commands.c"
 	}
 #line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = _result_;
@@ -14863,7 +14855,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_g_free0 (path);
 #line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 14867 "Commands.c"
+#line 14859 "Commands.c"
 }
 
 
@@ -14897,20 +14889,20 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_tmp3_ = new_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 14901 "Commands.c"
+#line 14893 "Commands.c"
 		const gchar* _tmp4_;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = new_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 14907 "Commands.c"
+#line 14899 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 14914 "Commands.c"
+#line 14906 "Commands.c"
 	}
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -14930,7 +14922,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_tmp11_ = tag_for_path (_tmp10_);
 #line 1765 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag = _tmp11_;
-#line 14934 "Commands.c"
+#line 14926 "Commands.c"
 	{
 		GeeIterator* _child_subpath_it = NULL;
 		GeeMap* _tmp12_;
@@ -14957,7 +14949,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 		_child_subpath_it = _tmp17_;
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14961 "Commands.c"
+#line 14953 "Commands.c"
 			GeeIterator* _tmp18_;
 			gboolean _tmp19_;
 			gchar* child_subpath = NULL;
@@ -14988,7 +14980,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			if (!_tmp19_) {
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14992 "Commands.c"
+#line 14984 "Commands.c"
 			}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp20_ = _child_subpath_it;
@@ -15032,7 +15024,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			_g_free0 (_tmp32_);
 #line 1770 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp34_) {
-#line 15036 "Commands.c"
+#line 15028 "Commands.c"
 				Tag* _tmp35_;
 				Tag* _tmp36_;
 				gchar* _tmp37_;
@@ -15067,7 +15059,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 				_g_free0 (_tmp40_);
 #line 1772 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (_tmp38_);
-#line 15071 "Commands.c"
+#line 15063 "Commands.c"
 			}
 #line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp43_ = tag_global;
@@ -15077,7 +15069,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			_tmp45_ = tag_source_collection_exists (_tmp43_, _tmp44_, FALSE);
 #line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
 			_vala_assert (_tmp45_, "Tag.global.exists(child_path)");
-#line 15081 "Commands.c"
+#line 15073 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp46_;
@@ -15104,7 +15096,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 				_s_it = _tmp51_;
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15108 "Commands.c"
+#line 15100 "Commands.c"
 					GeeIterator* _tmp52_;
 					gboolean _tmp53_;
 					MediaSource* s = NULL;
@@ -15122,7 +15114,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 					if (!_tmp53_) {
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15126 "Commands.c"
+#line 15118 "Commands.c"
 					}
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp54_ = _s_it;
@@ -15144,21 +15136,21 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 					_g_object_unref0 (_tmp58_);
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 15148 "Commands.c"
+#line 15140 "Commands.c"
 				}
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 15152 "Commands.c"
+#line 15144 "Commands.c"
 			}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_path);
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_subpath);
-#line 15158 "Commands.c"
+#line 15150 "Commands.c"
 		}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_child_subpath_it);
-#line 15162 "Commands.c"
+#line 15154 "Commands.c"
 	}
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
@@ -15166,7 +15158,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_g_free0 (path);
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (new_path);
-#line 15170 "Commands.c"
+#line 15162 "Commands.c"
 }
 
 
@@ -15198,20 +15190,20 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_tmp3_ = new_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 15202 "Commands.c"
+#line 15194 "Commands.c"
 		const gchar* _tmp4_;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = new_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 15208 "Commands.c"
+#line 15200 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 15215 "Commands.c"
+#line 15207 "Commands.c"
 	}
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -15231,7 +15223,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_tmp11_ = tag_for_path (_tmp10_);
 #line 1788 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag = _tmp11_;
-#line 15235 "Commands.c"
+#line 15227 "Commands.c"
 	{
 		GeeIterator* _s_it = NULL;
 		GeeHashSet* _tmp12_;
@@ -15244,7 +15236,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 		_s_it = _tmp13_;
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 15248 "Commands.c"
+#line 15240 "Commands.c"
 			GeeIterator* _tmp14_;
 			gboolean _tmp15_;
 			MediaSource* s = NULL;
@@ -15260,7 +15252,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 			if (!_tmp15_) {
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 15264 "Commands.c"
+#line 15256 "Commands.c"
 			}
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _s_it;
@@ -15276,11 +15268,11 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 			tag_attach (_tmp18_, _tmp19_);
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (s);
-#line 15280 "Commands.c"
+#line 15272 "Commands.c"
 		}
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_s_it);
-#line 15284 "Commands.c"
+#line 15276 "Commands.c"
 	}
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
@@ -15288,7 +15280,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_g_free0 (path);
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (new_path);
-#line 15292 "Commands.c"
+#line 15284 "Commands.c"
 }
 
 
@@ -15399,7 +15391,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp20_ = _tmp19_;
 #line 1812 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp20_ > 0) {
-#line 15403 "Commands.c"
+#line 15395 "Commands.c"
 		GeeList* _tmp21_;
 		GeeList* _tmp22_;
 		gint _tmp23_;
@@ -15419,13 +15411,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_free0 (self->priv->to_path_parent_path);
 #line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path_parent_path = (gchar*) _tmp25_;
-#line 15423 "Commands.c"
+#line 15415 "Commands.c"
 	}
 #line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp26_ = self->priv->to_path_parent_path;
 #line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp26_ != NULL) {
-#line 15429 "Commands.c"
+#line 15421 "Commands.c"
 		GeeMap* _tmp27_;
 		const gchar* _tmp28_;
 		GeeMap* _tmp29_;
@@ -15441,13 +15433,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (self->priv->existing_dest_child_structure);
 #line 1816 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->existing_dest_child_structure = _tmp29_;
-#line 15445 "Commands.c"
+#line 15437 "Commands.c"
 	}
 #line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = self->priv->to_path_parent_path;
 #line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp30_ == NULL) {
-#line 15451 "Commands.c"
+#line 15443 "Commands.c"
 		GeeMap* _tmp31_;
 		GeeSet* _tmp32_;
 		const gchar* _tmp33_;
@@ -15499,13 +15491,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp41_);
 #line 1825 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp39_);
-#line 15503 "Commands.c"
+#line 15495 "Commands.c"
 	}
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp42_ = self->priv->to_path_parent_path;
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp42_ != NULL) {
-#line 15509 "Commands.c"
+#line 15501 "Commands.c"
 		gchar* new_tpp = NULL;
 		const gchar* _tmp43_;
 		gchar* _tmp44_;
@@ -15531,20 +15523,20 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_tmp46_ = new_tpp;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp46_ != NULL) {
-#line 15535 "Commands.c"
+#line 15527 "Commands.c"
 			const gchar* _tmp47_;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp47_ = new_tpp;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp45_ = _tmp47_;
-#line 15541 "Commands.c"
+#line 15533 "Commands.c"
 		} else {
 			const gchar* _tmp48_;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp48_ = self->priv->to_path_parent_path;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp45_ = _tmp48_;
-#line 15548 "Commands.c"
+#line 15540 "Commands.c"
 		}
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp49_ = g_strdup (_tmp45_);
@@ -15580,13 +15572,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp56_);
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_tpp);
-#line 15584 "Commands.c"
+#line 15576 "Commands.c"
 	}
 #line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp59_ = self->priv->to_path_parent_path;
 #line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp59_ == NULL) {
-#line 15590 "Commands.c"
+#line 15582 "Commands.c"
 		GeeList* _tmp60_;
 		const gchar* _tmp61_;
 		Tag* _tmp62_;
@@ -15611,7 +15603,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_source_proxy_unref0 (_tmp65_);
 #line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp63_);
-#line 15615 "Commands.c"
+#line 15607 "Commands.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp66_ = from_tag;
@@ -15619,7 +15611,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp67_ = tag_get_hierarchical_children (_tmp66_);
 #line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
 	from_children = _tmp67_;
-#line 15623 "Commands.c"
+#line 15615 "Commands.c"
 	{
 		gint i = 0;
 		GeeList* _tmp68_;
@@ -15633,14 +15625,14 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_tmp70_ = _tmp69_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp70_ - 1;
-#line 15637 "Commands.c"
+#line 15629 "Commands.c"
 		{
 			gboolean _tmp71_ = FALSE;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp71_ = TRUE;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 15644 "Commands.c"
+#line 15636 "Commands.c"
 				gint _tmp73_;
 				GeeList* _tmp74_;
 				GeeList* _tmp75_;
@@ -15651,13 +15643,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				SourceProxy* _tmp80_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp71_) {
-#line 15655 "Commands.c"
+#line 15647 "Commands.c"
 					gint _tmp72_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp72_ = i;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp72_ - 1;
-#line 15661 "Commands.c"
+#line 15653 "Commands.c"
 				}
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp71_ = FALSE;
@@ -15667,7 +15659,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				if (!(_tmp73_ >= 0)) {
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 15671 "Commands.c"
+#line 15663 "Commands.c"
 				}
 #line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp74_ = self->priv->src_before_state;
@@ -15689,7 +15681,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				_source_proxy_unref0 (_tmp80_);
 #line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp78_);
-#line 15693 "Commands.c"
+#line 15685 "Commands.c"
 			}
 		}
 	}
@@ -15697,7 +15689,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp81_ = self->priv->to_path_parent_path;
 #line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp81_ != NULL) {
-#line 15701 "Commands.c"
+#line 15693 "Commands.c"
 		GeeList* to_children = NULL;
 		const gchar* _tmp82_;
 		Tag* _tmp83_;
@@ -15718,7 +15710,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp84_);
 #line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
 		to_children = _tmp86_;
-#line 15722 "Commands.c"
+#line 15714 "Commands.c"
 		{
 			gint i = 0;
 			GeeList* _tmp87_;
@@ -15732,14 +15724,14 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 			_tmp89_ = _tmp88_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp89_ - 1;
-#line 15736 "Commands.c"
+#line 15728 "Commands.c"
 			{
 				gboolean _tmp90_ = FALSE;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp90_ = TRUE;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15743 "Commands.c"
+#line 15735 "Commands.c"
 					gint _tmp92_;
 					GeeList* _tmp93_;
 					GeeList* _tmp94_;
@@ -15750,13 +15742,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					SourceProxy* _tmp99_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp90_) {
-#line 15754 "Commands.c"
+#line 15746 "Commands.c"
 						gint _tmp91_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp91_ = i;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp91_ - 1;
-#line 15760 "Commands.c"
+#line 15752 "Commands.c"
 					}
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp90_ = FALSE;
@@ -15766,7 +15758,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					if (!(_tmp92_ >= 0)) {
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15770 "Commands.c"
+#line 15762 "Commands.c"
 					}
 #line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp93_ = self->priv->dest_before_state;
@@ -15788,19 +15780,19 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					_source_proxy_unref0 (_tmp99_);
 #line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp97_);
-#line 15792 "Commands.c"
+#line 15784 "Commands.c"
 				}
 			}
 		}
 #line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (to_children);
-#line 15798 "Commands.c"
+#line 15790 "Commands.c"
 	}
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp100_ = self->priv->to_path_parent_path;
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp100_ == NULL) {
-#line 15804 "Commands.c"
+#line 15796 "Commands.c"
 		GeeList* to_children = NULL;
 		const gchar* _tmp101_;
 		Tag* _tmp102_;
@@ -15821,7 +15813,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp103_);
 #line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
 		to_children = _tmp105_;
-#line 15825 "Commands.c"
+#line 15817 "Commands.c"
 		{
 			gint i = 0;
 			GeeList* _tmp106_;
@@ -15835,14 +15827,14 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 			_tmp108_ = _tmp107_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp108_ - 1;
-#line 15839 "Commands.c"
+#line 15831 "Commands.c"
 			{
 				gboolean _tmp109_ = FALSE;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp109_ = TRUE;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15846 "Commands.c"
+#line 15838 "Commands.c"
 					gint _tmp111_;
 					GeeList* _tmp112_;
 					GeeList* _tmp113_;
@@ -15853,13 +15845,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					SourceProxy* _tmp118_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp109_) {
-#line 15857 "Commands.c"
+#line 15849 "Commands.c"
 						gint _tmp110_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp110_ = i;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp110_ - 1;
-#line 15863 "Commands.c"
+#line 15855 "Commands.c"
 					}
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp109_ = FALSE;
@@ -15869,7 +15861,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					if (!(_tmp111_ >= 0)) {
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15873 "Commands.c"
+#line 15865 "Commands.c"
 					}
 #line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp112_ = self->priv->dest_before_state;
@@ -15891,13 +15883,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					_source_proxy_unref0 (_tmp118_);
 #line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp116_);
-#line 15895 "Commands.c"
+#line 15887 "Commands.c"
 				}
 			}
 		}
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (to_children);
-#line 15901 "Commands.c"
+#line 15893 "Commands.c"
 	}
 #line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_children);
@@ -15905,7 +15897,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_g_object_unref0 (parent_paths);
 #line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 15909 "Commands.c"
+#line 15901 "Commands.c"
 }
 
 
@@ -15928,7 +15920,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 15932 "Commands.c"
+#line 15924 "Commands.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -15936,7 +15928,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 15940 "Commands.c"
+#line 15932 "Commands.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -15948,7 +15940,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 15952 "Commands.c"
+#line 15944 "Commands.c"
 	}
 }
 
@@ -15972,21 +15964,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 15976 "Commands.c"
+#line 15968 "Commands.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 15982 "Commands.c"
+#line 15974 "Commands.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 15986 "Commands.c"
+#line 15978 "Commands.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 15990 "Commands.c"
+#line 15982 "Commands.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -15998,7 +15990,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 16002 "Commands.c"
+#line 15994 "Commands.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -16008,13 +16000,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 16012 "Commands.c"
+#line 16004 "Commands.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 16018 "Commands.c"
+#line 16010 "Commands.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -16028,7 +16020,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 16032 "Commands.c"
+#line 16024 "Commands.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -16038,13 +16030,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 16042 "Commands.c"
+#line 16034 "Commands.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 16048 "Commands.c"
+#line 16040 "Commands.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -16053,7 +16045,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 16057 "Commands.c"
+#line 16049 "Commands.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -16073,7 +16065,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 16077 "Commands.c"
+#line 16069 "Commands.c"
 }
 
 
@@ -16100,7 +16092,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 	_tmp2_ = self->priv->to_path_parent_path;
 #line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 16104 "Commands.c"
+#line 16096 "Commands.c"
 		gchar* new_tpp = NULL;
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
@@ -16117,20 +16109,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp6_ = new_tpp;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp6_ != NULL) {
-#line 16121 "Commands.c"
+#line 16113 "Commands.c"
 			const gchar* _tmp7_;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = new_tpp;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _tmp7_;
-#line 16127 "Commands.c"
+#line 16119 "Commands.c"
 		} else {
 			const gchar* _tmp8_;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = self->priv->to_path_parent_path;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _tmp8_;
-#line 16134 "Commands.c"
+#line 16126 "Commands.c"
 		}
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = g_strdup (_tmp5_);
@@ -16140,32 +16132,32 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		self->priv->to_path_parent_path = _tmp9_;
 #line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_tpp);
-#line 16144 "Commands.c"
+#line 16136 "Commands.c"
 	}
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = self->priv->to_path_parent_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp11_ != NULL) {
-#line 16150 "Commands.c"
+#line 16142 "Commands.c"
 		const gchar* _tmp12_;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = self->priv->to_path_parent_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp12_;
-#line 16156 "Commands.c"
+#line 16148 "Commands.c"
 	} else {
 		const gchar* _tmp13_;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = self->priv->to_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp13_;
-#line 16163 "Commands.c"
+#line 16155 "Commands.c"
 	}
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp14_ = g_strdup (_tmp10_);
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	unwind_target = _tmp14_;
-#line 16169 "Commands.c"
+#line 16161 "Commands.c"
 	{
 		GeeList* _t_list = NULL;
 		const gchar* _tmp15_;
@@ -16204,7 +16196,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_t_index = -1;
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 16208 "Commands.c"
+#line 16200 "Commands.c"
 			gint _tmp23_;
 			gint _tmp24_;
 			gint _tmp25_;
@@ -16236,7 +16228,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			if (!(_tmp24_ < _tmp25_)) {
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 16240 "Commands.c"
+#line 16232 "Commands.c"
 			}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = _t_list;
@@ -16268,7 +16260,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_tmp36_ = g_str_has_prefix (_tmp35_, TAG_PATH_SEPARATOR_STRING);
 #line 1876 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp36_) {
-#line 16272 "Commands.c"
+#line 16264 "Commands.c"
 				const gchar* _tmp37_;
 				gchar* _tmp38_;
 #line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16279,7 +16271,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_free0 (child_subpath);
 #line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
 				child_subpath = _tmp38_;
-#line 16283 "Commands.c"
+#line 16275 "Commands.c"
 			}
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp39_ = self->priv->existing_dest_child_structure;
@@ -16289,7 +16281,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_tmp41_ = gee_map_has_key (_tmp39_, _tmp40_);
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (!_tmp41_) {
-#line 16293 "Commands.c"
+#line 16285 "Commands.c"
 				TagSourceCollection* _tmp42_;
 				TagSourceCollection* _tmp43_;
 				Tag* _tmp44_;
@@ -16309,7 +16301,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp46_, TRUE, NULL, NULL, NULL);
 #line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp46_);
-#line 16313 "Commands.c"
+#line 16305 "Commands.c"
 			} else {
 				GeeSet* starting_sources = NULL;
 				GeeHashSet* _tmp47_;
@@ -16333,7 +16325,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_);
 #line 1883 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp51_);
-#line 16337 "Commands.c"
+#line 16329 "Commands.c"
 				{
 					GeeIterator* _source_it = NULL;
 					GeeSet* _tmp52_;
@@ -16346,7 +16338,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 					_source_it = _tmp53_;
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 16350 "Commands.c"
+#line 16342 "Commands.c"
 						GeeIterator* _tmp54_;
 						gboolean _tmp55_;
 						MediaSource* source = NULL;
@@ -16367,7 +16359,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 						if (!_tmp55_) {
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 16371 "Commands.c"
+#line 16363 "Commands.c"
 						}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp56_ = _source_it;
@@ -16393,7 +16385,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 						_g_object_unref0 (_tmp61_);
 #line 1885 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp64_) {
-#line 16397 "Commands.c"
+#line 16389 "Commands.c"
 							Tag* _tmp65_;
 							MediaSource* _tmp66_;
 							GeeList* _tmp67_;
@@ -16408,42 +16400,42 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 							_tmp68_ = _tmp67_;
 #line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_tmp68_);
-#line 16412 "Commands.c"
+#line 16404 "Commands.c"
 						}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (source);
-#line 16416 "Commands.c"
+#line 16408 "Commands.c"
 					}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_source_it);
-#line 16420 "Commands.c"
+#line 16412 "Commands.c"
 				}
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (starting_sources);
-#line 16424 "Commands.c"
+#line 16416 "Commands.c"
 			}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_subpath);
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (t);
-#line 16430 "Commands.c"
+#line 16422 "Commands.c"
 		}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_t_list);
-#line 16434 "Commands.c"
+#line 16426 "Commands.c"
 	}
 	{
 		gint i = 0;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 16440 "Commands.c"
+#line 16432 "Commands.c"
 		{
 			gboolean _tmp69_ = FALSE;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp69_ = TRUE;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16447 "Commands.c"
+#line 16439 "Commands.c"
 				gint _tmp71_;
 				GeeList* _tmp72_;
 				gint _tmp73_;
@@ -16456,13 +16448,13 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				DataSource* _tmp80_;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp69_) {
-#line 16460 "Commands.c"
+#line 16452 "Commands.c"
 					gint _tmp70_;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp70_ = i;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp70_ + 1;
-#line 16466 "Commands.c"
+#line 16458 "Commands.c"
 				}
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp69_ = FALSE;
@@ -16478,7 +16470,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp71_ < _tmp74_)) {
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16482 "Commands.c"
+#line 16474 "Commands.c"
 				}
 #line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp75_ = self->priv->src_before_state;
@@ -16496,7 +16488,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp80_);
 #line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp78_);
-#line 16500 "Commands.c"
+#line 16492 "Commands.c"
 			}
 		}
 	}
@@ -16504,14 +16496,14 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		gint i = 0;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 16508 "Commands.c"
+#line 16500 "Commands.c"
 		{
 			gboolean _tmp81_ = FALSE;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp81_ = TRUE;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16515 "Commands.c"
+#line 16507 "Commands.c"
 				gint _tmp83_;
 				GeeList* _tmp84_;
 				gint _tmp85_;
@@ -16524,13 +16516,13 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				DataSource* _tmp92_;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp81_) {
-#line 16528 "Commands.c"
+#line 16520 "Commands.c"
 					gint _tmp82_;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp82_ = i;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp82_ + 1;
-#line 16534 "Commands.c"
+#line 16526 "Commands.c"
 				}
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp81_ = FALSE;
@@ -16546,7 +16538,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp83_ < _tmp86_)) {
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16550 "Commands.c"
+#line 16542 "Commands.c"
 				}
 #line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp87_ = self->priv->dest_before_state;
@@ -16564,7 +16556,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp92_);
 #line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp90_);
-#line 16568 "Commands.c"
+#line 16560 "Commands.c"
 			}
 		}
 	}
@@ -16572,7 +16564,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 	_tmp93_ = self->priv->to_path_parent_path;
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp93_ != NULL) {
-#line 16576 "Commands.c"
+#line 16568 "Commands.c"
 		gchar* new_path = NULL;
 		const gchar* _tmp94_;
 		gchar* _tmp95_;
@@ -16601,20 +16593,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp97_ = new_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp97_ != NULL) {
-#line 16605 "Commands.c"
+#line 16597 "Commands.c"
 			const gchar* _tmp98_;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp98_ = new_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp96_ = _tmp98_;
-#line 16611 "Commands.c"
+#line 16603 "Commands.c"
 		} else {
 			const gchar* _tmp99_;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp99_ = self->priv->to_path_parent_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp96_ = _tmp99_;
-#line 16618 "Commands.c"
+#line 16610 "Commands.c"
 		}
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp100_ = g_strdup (_tmp96_);
@@ -16640,7 +16632,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp107_ = tag_get_hierarchical_children (_tmp106_);
 #line 1904 "/home/jens/Source/shotwell/src/Commands.vala"
 		kids = _tmp107_;
-#line 16644 "Commands.c"
+#line 16636 "Commands.c"
 		{
 			GeeList* _kidtag_list = NULL;
 			GeeList* _tmp108_;
@@ -16668,7 +16660,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_kidtag_index = -1;
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16672 "Commands.c"
+#line 16664 "Commands.c"
 				gint _tmp113_;
 				gint _tmp114_;
 				gint _tmp115_;
@@ -16694,7 +16686,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp114_ < _tmp115_)) {
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16698 "Commands.c"
+#line 16690 "Commands.c"
 				}
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp116_ = _kidtag_list;
@@ -16722,11 +16714,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp122_);
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (kidtag);
-#line 16726 "Commands.c"
+#line 16718 "Commands.c"
 			}
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_kidtag_list);
-#line 16730 "Commands.c"
+#line 16722 "Commands.c"
 		}
 #line 1908 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp125_ = path;
@@ -16742,7 +16734,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_g_free0 (path);
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_path);
-#line 16746 "Commands.c"
+#line 16738 "Commands.c"
 	} else {
 		GeeSet* _tmp127_;
 		const gchar* _tmp128_;
@@ -16825,7 +16817,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_g_object_unref0 (_tmp144_);
 #line 1914 "/home/jens/Source/shotwell/src/Commands.vala"
 		kids = _tmp146_;
-#line 16829 "Commands.c"
+#line 16821 "Commands.c"
 		{
 			GeeList* _kidtag_list = NULL;
 			GeeList* _tmp147_;
@@ -16853,7 +16845,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_kidtag_index = -1;
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16857 "Commands.c"
+#line 16849 "Commands.c"
 				gint _tmp152_;
 				gint _tmp153_;
 				gint _tmp154_;
@@ -16879,7 +16871,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp153_ < _tmp154_)) {
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16883 "Commands.c"
+#line 16875 "Commands.c"
 				}
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp155_ = _kidtag_list;
@@ -16907,11 +16899,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp161_);
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (kidtag);
-#line 16911 "Commands.c"
+#line 16903 "Commands.c"
 			}
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_kidtag_list);
-#line 16915 "Commands.c"
+#line 16907 "Commands.c"
 		}
 #line 1918 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp164_ = self->priv->to_path;
@@ -16921,11 +16913,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		reparent_tag_command_restore_child_attachments_at (self, _tmp164_, _tmp165_);
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (kids);
-#line 16925 "Commands.c"
+#line 16917 "Commands.c"
 	}
 #line 1863 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (unwind_target);
-#line 16929 "Commands.c"
+#line 16921 "Commands.c"
 }
 
 
@@ -16989,7 +16981,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 	_tmp12_ = tag_get_hierarchical_children (_tmp11_);
 #line 1933 "/home/jens/Source/shotwell/src/Commands.vala"
 	to_children = _tmp12_;
-#line 16993 "Commands.c"
+#line 16985 "Commands.c"
 	{
 		gint i = 0;
 		GeeList* _tmp13_;
@@ -17003,14 +16995,14 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 		_tmp15_ = _tmp14_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp15_ - 1;
-#line 17007 "Commands.c"
+#line 16999 "Commands.c"
 		{
 			gboolean _tmp16_ = FALSE;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = TRUE;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17014 "Commands.c"
+#line 17006 "Commands.c"
 				gint _tmp18_;
 				GeeList* _tmp19_;
 				GeeList* _tmp20_;
@@ -17021,13 +17013,13 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				SourceProxy* _tmp25_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp16_) {
-#line 17025 "Commands.c"
+#line 17017 "Commands.c"
 					gint _tmp17_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp17_ = i;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp17_ - 1;
-#line 17031 "Commands.c"
+#line 17023 "Commands.c"
 				}
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = FALSE;
@@ -17037,7 +17029,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				if (!(_tmp18_ >= 0)) {
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17041 "Commands.c"
+#line 17033 "Commands.c"
 				}
 #line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp19_ = self->priv->after_state;
@@ -17059,7 +17051,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				_source_proxy_unref0 (_tmp25_);
 #line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp23_);
-#line 17063 "Commands.c"
+#line 17055 "Commands.c"
 			}
 		}
 	}
@@ -17067,7 +17059,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 	_g_object_unref0 (to_children);
 #line 1922 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (to_tag);
-#line 17071 "Commands.c"
+#line 17063 "Commands.c"
 }
 
 
@@ -17079,19 +17071,19 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 	_tmp0_ = self->priv->after_state;
 #line 1939 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "after_state != null");
-#line 17083 "Commands.c"
+#line 17075 "Commands.c"
 	{
 		gint i = 0;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 17088 "Commands.c"
+#line 17080 "Commands.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp1_ = TRUE;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17095 "Commands.c"
+#line 17087 "Commands.c"
 				gint _tmp3_;
 				GeeList* _tmp4_;
 				gint _tmp5_;
@@ -17104,13 +17096,13 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				DataSource* _tmp12_;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp1_) {
-#line 17108 "Commands.c"
+#line 17100 "Commands.c"
 					gint _tmp2_;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp2_ = i;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp2_ + 1;
-#line 17114 "Commands.c"
+#line 17106 "Commands.c"
 				}
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp1_ = FALSE;
@@ -17126,7 +17118,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				if (!(_tmp3_ < _tmp6_)) {
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17130 "Commands.c"
+#line 17122 "Commands.c"
 				}
 #line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp7_ = self->priv->after_state;
@@ -17144,7 +17136,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp12_);
 #line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp10_);
-#line 17148 "Commands.c"
+#line 17140 "Commands.c"
 			}
 		}
 	}
@@ -17168,7 +17160,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 	_tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING);
 #line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 17172 "Commands.c"
+#line 17164 "Commands.c"
 		GeeList* parent_paths = NULL;
 		const gchar* _tmp2_;
 		GeeList* _tmp3_;
@@ -17189,7 +17181,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 		_tmp6_ = _tmp5_;
 #line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp6_ > 0) {
-#line 17193 "Commands.c"
+#line 17185 "Commands.c"
 			gchar* immediate_parent_path = NULL;
 			GeeList* _tmp7_;
 			GeeList* _tmp8_;
@@ -17219,7 +17211,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 			_tmp14_ = tag_source_collection_exists (_tmp12_, _tmp13_, FALSE);
 #line 1952 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp14_) {
-#line 17223 "Commands.c"
+#line 17215 "Commands.c"
 				const gchar* _tmp15_;
 				Tag* _tmp16_;
 #line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17230,7 +17222,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 				_g_object_unref0 (new_parent);
 #line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
 				new_parent = _tmp16_;
-#line 17234 "Commands.c"
+#line 17226 "Commands.c"
 			} else {
 				TagSourceCollection* _tmp17_;
 				const gchar* _tmp18_;
@@ -17254,7 +17246,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 				_g_free0 (_tmp20_);
 #line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp22_) {
-#line 17258 "Commands.c"
+#line 17250 "Commands.c"
 					const gchar* _tmp23_;
 					gchar* _tmp24_;
 					gchar* _tmp25_;
@@ -17273,36 +17265,36 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 					new_parent = _tmp26_;
 #line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_free0 (_tmp25_);
-#line 17277 "Commands.c"
+#line 17269 "Commands.c"
 				} else {
 #line 1957 "/home/jens/Source/shotwell/src/Commands.vala"
 					g_assert_not_reached ();
-#line 17281 "Commands.c"
+#line 17273 "Commands.c"
 				}
 			}
 #line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (immediate_parent_path);
-#line 17286 "Commands.c"
+#line 17278 "Commands.c"
 		}
 #line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (parent_paths);
-#line 17290 "Commands.c"
+#line 17282 "Commands.c"
 	}
 #line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp27_ = new_parent;
 #line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp27_ != NULL) {
-#line 17296 "Commands.c"
+#line 17288 "Commands.c"
 		Tag* _tmp28_;
 #line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp28_ = new_parent;
 #line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_promote (_tmp28_);
-#line 17302 "Commands.c"
+#line 17294 "Commands.c"
 	}
 #line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (new_parent);
-#line 17306 "Commands.c"
+#line 17298 "Commands.c"
 }
 
 
@@ -17334,7 +17326,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 	_tmp5_ = self->priv->src_parent_detachments;
 #line 1969 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_ == NULL) {
-#line 17338 "Commands.c"
+#line 17330 "Commands.c"
 		GeeHashMap* _tmp6_;
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -17342,7 +17334,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 		_g_object_unref0 (self->priv->src_parent_detachments);
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->src_parent_detachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap);
-#line 17346 "Commands.c"
+#line 17338 "Commands.c"
 		{
 			GeeIterator* _source_it = NULL;
 			Tag* _tmp7_;
@@ -17366,7 +17358,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			_source_it = _tmp11_;
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17370 "Commands.c"
+#line 17362 "Commands.c"
 				GeeIterator* _tmp12_;
 				gboolean _tmp13_;
 				MediaSource* source = NULL;
@@ -17387,7 +17379,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				if (!_tmp13_) {
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17391 "Commands.c"
+#line 17383 "Commands.c"
 				}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = _source_it;
@@ -17411,7 +17403,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				running_attach_count = _tmp20_ + 1;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17415 "Commands.c"
+#line 17407 "Commands.c"
 					Tag* _tmp21_;
 					gchar* current_parent_path = NULL;
 					Tag* _tmp22_;
@@ -17436,7 +17428,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					if (!(_tmp21_ != NULL)) {
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17440 "Commands.c"
+#line 17432 "Commands.c"
 					}
 #line 1975 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp22_ = current_parent;
@@ -17452,7 +17444,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_tmp26_ = gee_map_has_key (_tmp24_, _tmp25_);
 #line 1976 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp26_) {
-#line 17456 "Commands.c"
+#line 17448 "Commands.c"
 						GeeMap* _tmp27_;
 						const gchar* _tmp28_;
 						GeeHashSet* _tmp29_;
@@ -17469,7 +17461,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 						gee_map_set (_tmp27_, _tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_SET, GeeSet));
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp30_);
-#line 17473 "Commands.c"
+#line 17465 "Commands.c"
 					}
 #line 1979 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp31_ = current_parent;
@@ -17491,7 +17483,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_tmp37_ = running_attach_count;
 #line 1985 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp36_ == _tmp37_) {
-#line 17495 "Commands.c"
+#line 17487 "Commands.c"
 						GeeMap* _tmp38_;
 						const gchar* _tmp39_;
 						gpointer _tmp40_;
@@ -17511,7 +17503,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
 #line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp41_);
-#line 17515 "Commands.c"
+#line 17507 "Commands.c"
 					}
 #line 1988 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp43_ = running_attach_count;
@@ -17527,17 +17519,17 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					current_parent = _tmp45_;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_free0 (current_parent_path);
-#line 17531 "Commands.c"
+#line 17523 "Commands.c"
 				}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (current_parent);
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (source);
-#line 17537 "Commands.c"
+#line 17529 "Commands.c"
 			}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_source_it);
-#line 17541 "Commands.c"
+#line 17533 "Commands.c"
 		}
 	}
 	{
@@ -17566,7 +17558,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 		_p_it = _tmp51_;
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17570 "Commands.c"
+#line 17562 "Commands.c"
 			GeeIterator* _tmp52_;
 			gboolean _tmp53_;
 			gchar* p = NULL;
@@ -17580,7 +17572,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			if (!_tmp53_) {
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17584 "Commands.c"
+#line 17576 "Commands.c"
 			}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp54_ = _p_it;
@@ -17588,7 +17580,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			_tmp55_ = gee_iterator_get (_tmp54_);
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp55_;
-#line 17592 "Commands.c"
+#line 17584 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp56_;
@@ -17615,7 +17607,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				_s_it = _tmp61_;
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17619 "Commands.c"
+#line 17611 "Commands.c"
 					GeeIterator* _tmp62_;
 					gboolean _tmp63_;
 					MediaSource* s = NULL;
@@ -17635,7 +17627,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					if (!_tmp63_) {
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17639 "Commands.c"
+#line 17631 "Commands.c"
 					}
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp64_ = _s_it;
@@ -17661,23 +17653,23 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_g_object_unref0 (_tmp68_);
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17665 "Commands.c"
+#line 17657 "Commands.c"
 				}
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17669 "Commands.c"
+#line 17661 "Commands.c"
 			}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17673 "Commands.c"
+#line 17665 "Commands.c"
 		}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17677 "Commands.c"
+#line 17669 "Commands.c"
 	}
 #line 1964 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 17681 "Commands.c"
+#line 17673 "Commands.c"
 }
 
 
@@ -17689,7 +17681,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 	_tmp0_ = self->priv->src_parent_detachments;
 #line 2001 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "src_parent_detachments != null");
-#line 17693 "Commands.c"
+#line 17685 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
 		GeeMap* _tmp1_;
@@ -17716,7 +17708,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 		_p_it = _tmp6_;
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17720 "Commands.c"
+#line 17712 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			gchar* p = NULL;
@@ -17730,7 +17722,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 			if (!_tmp8_) {
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17734 "Commands.c"
+#line 17726 "Commands.c"
 			}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -17738,7 +17730,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 17742 "Commands.c"
+#line 17734 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp11_;
@@ -17765,7 +17757,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 				_s_it = _tmp16_;
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17769 "Commands.c"
+#line 17761 "Commands.c"
 					GeeIterator* _tmp17_;
 					gboolean _tmp18_;
 					MediaSource* s = NULL;
@@ -17783,7 +17775,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 					if (!_tmp18_) {
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17787 "Commands.c"
+#line 17779 "Commands.c"
 					}
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -17805,19 +17797,19 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 					_g_object_unref0 (_tmp23_);
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17809 "Commands.c"
+#line 17801 "Commands.c"
 				}
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17813 "Commands.c"
+#line 17805 "Commands.c"
 			}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17817 "Commands.c"
+#line 17809 "Commands.c"
 		}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17821 "Commands.c"
+#line 17813 "Commands.c"
 	}
 }
 
@@ -17830,7 +17822,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 	_tmp0_ = self->priv->dest_parent_attachments;
 #line 2009 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 17834 "Commands.c"
+#line 17826 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
 		GeeMap* _tmp1_;
@@ -17857,7 +17849,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 		_p_it = _tmp6_;
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17861 "Commands.c"
+#line 17853 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			gchar* p = NULL;
@@ -17871,7 +17863,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 			if (!_tmp8_) {
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17875 "Commands.c"
+#line 17867 "Commands.c"
 			}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -17879,7 +17871,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 17883 "Commands.c"
+#line 17875 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp11_;
@@ -17906,7 +17898,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 				_s_it = _tmp16_;
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17910 "Commands.c"
+#line 17902 "Commands.c"
 					GeeIterator* _tmp17_;
 					gboolean _tmp18_;
 					MediaSource* s = NULL;
@@ -17926,7 +17918,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 					if (!_tmp18_) {
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17930 "Commands.c"
+#line 17922 "Commands.c"
 					}
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -17952,19 +17944,19 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 					_g_object_unref0 (_tmp23_);
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17956 "Commands.c"
+#line 17948 "Commands.c"
 				}
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17960 "Commands.c"
+#line 17952 "Commands.c"
 			}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17964 "Commands.c"
+#line 17956 "Commands.c"
 		}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17968 "Commands.c"
+#line 17960 "Commands.c"
 	}
 }
 
@@ -17977,7 +17969,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 	_tmp0_ = self->priv->dest_parent_attachments;
 #line 2017 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 17981 "Commands.c"
+#line 17973 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
 		GeeMap* _tmp1_;
@@ -18004,7 +17996,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 		_p_it = _tmp6_;
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18008 "Commands.c"
+#line 18000 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			gchar* p = NULL;
@@ -18018,7 +18010,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 			if (!_tmp8_) {
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18022 "Commands.c"
+#line 18014 "Commands.c"
 			}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -18026,7 +18018,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 18030 "Commands.c"
+#line 18022 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp11_;
@@ -18053,7 +18045,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 				_s_it = _tmp16_;
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 18057 "Commands.c"
+#line 18049 "Commands.c"
 					GeeIterator* _tmp17_;
 					gboolean _tmp18_;
 					MediaSource* s = NULL;
@@ -18071,7 +18063,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 					if (!_tmp18_) {
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 18075 "Commands.c"
+#line 18067 "Commands.c"
 					}
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -18093,19 +18085,19 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 					_g_object_unref0 (_tmp23_);
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 18097 "Commands.c"
+#line 18089 "Commands.c"
 				}
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 18101 "Commands.c"
+#line 18093 "Commands.c"
 			}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 18105 "Commands.c"
+#line 18097 "Commands.c"
 		}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 18109 "Commands.c"
+#line 18101 "Commands.c"
 	}
 }
 
@@ -18156,7 +18148,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_g_object_unref0 (self->priv->dest_parent_attachments);
 #line 2033 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->dest_parent_attachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap);
-#line 18160 "Commands.c"
+#line 18152 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		Tag* _tmp8_;
@@ -18180,7 +18172,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_source_it = _tmp12_;
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18184 "Commands.c"
+#line 18176 "Commands.c"
 			GeeIterator* _tmp13_;
 			gboolean _tmp14_;
 			MediaSource* source = NULL;
@@ -18197,7 +18189,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			if (!_tmp14_) {
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18201 "Commands.c"
+#line 18193 "Commands.c"
 			}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = _source_it;
@@ -18213,7 +18205,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			current_parent = _tmp18_;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18217 "Commands.c"
+#line 18209 "Commands.c"
 				Tag* _tmp19_;
 				gchar* current_parent_path = NULL;
 				Tag* _tmp20_;
@@ -18232,7 +18224,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				if (!(_tmp19_ != NULL)) {
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18236 "Commands.c"
+#line 18228 "Commands.c"
 				}
 #line 2037 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = current_parent;
@@ -18248,7 +18240,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_tmp24_ = gee_map_has_key (_tmp22_, _tmp23_);
 #line 2038 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp24_) {
-#line 18252 "Commands.c"
+#line 18244 "Commands.c"
 					GeeMap* _tmp25_;
 					const gchar* _tmp26_;
 					GeeHashSet* _tmp27_;
@@ -18265,7 +18257,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					gee_map_set (_tmp25_, _tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_SET, GeeSet));
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp28_);
-#line 18269 "Commands.c"
+#line 18261 "Commands.c"
 				}
 #line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp29_ = current_parent;
@@ -18275,7 +18267,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_tmp31_ = tag_contains (_tmp29_, _tmp30_);
 #line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp31_) {
-#line 18279 "Commands.c"
+#line 18271 "Commands.c"
 					GeeMap* _tmp32_;
 					const gchar* _tmp33_;
 					gpointer _tmp34_;
@@ -18295,7 +18287,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
 #line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp35_);
-#line 18299 "Commands.c"
+#line 18291 "Commands.c"
 				}
 #line 2044 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp37_ = current_parent;
@@ -18307,17 +18299,17 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				current_parent = _tmp38_;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (current_parent_path);
-#line 18311 "Commands.c"
+#line 18303 "Commands.c"
 			}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (current_parent);
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 18317 "Commands.c"
+#line 18309 "Commands.c"
 		}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 18321 "Commands.c"
+#line 18313 "Commands.c"
 	}
 	{
 		GeeIterator* _source_it = NULL;
@@ -18342,7 +18334,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_source_it = _tmp43_;
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18346 "Commands.c"
+#line 18338 "Commands.c"
 			GeeIterator* _tmp44_;
 			gboolean _tmp45_;
 			MediaSource* source = NULL;
@@ -18358,7 +18350,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			if (!_tmp45_) {
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18362 "Commands.c"
+#line 18354 "Commands.c"
 			}
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp46_ = _source_it;
@@ -18374,11 +18366,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			tag_attach (_tmp48_, _tmp49_);
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 18378 "Commands.c"
+#line 18370 "Commands.c"
 		}
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 18382 "Commands.c"
+#line 18374 "Commands.c"
 	}
 #line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp50_ = from_tag;
@@ -18386,7 +18378,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_tmp51_ = tag_get_hierarchical_children (_tmp50_);
 #line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
 	from_children = _tmp51_;
-#line 18390 "Commands.c"
+#line 18382 "Commands.c"
 	{
 		gint i = 0;
 		GeeList* _tmp52_;
@@ -18400,14 +18392,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_tmp54_ = _tmp53_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp54_ - 1;
-#line 18404 "Commands.c"
+#line 18396 "Commands.c"
 		{
 			gboolean _tmp55_ = FALSE;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp55_ = TRUE;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18411 "Commands.c"
+#line 18403 "Commands.c"
 				gint _tmp57_;
 				Tag* from_child = NULL;
 				GeeList* _tmp58_;
@@ -18435,13 +18427,13 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				Tag* _tmp78_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp55_) {
-#line 18439 "Commands.c"
+#line 18431 "Commands.c"
 					gint _tmp56_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp56_ = i;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp56_ - 1;
-#line 18445 "Commands.c"
+#line 18437 "Commands.c"
 				}
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp55_ = FALSE;
@@ -18451,7 +18443,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				if (!(_tmp57_ >= 0)) {
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18455 "Commands.c"
+#line 18447 "Commands.c"
 				}
 #line 2055 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp58_ = from_children;
@@ -18511,7 +18503,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_g_free0 (_tmp71_);
 #line 2060 "/home/jens/Source/shotwell/src/Commands.vala"
 				to_child = _tmp78_;
-#line 18515 "Commands.c"
+#line 18507 "Commands.c"
 				{
 					GeeIterator* _source_it = NULL;
 					Tag* _tmp79_;
@@ -18535,7 +18527,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					_source_it = _tmp83_;
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 18539 "Commands.c"
+#line 18531 "Commands.c"
 						GeeIterator* _tmp84_;
 						gboolean _tmp85_;
 						MediaSource* source = NULL;
@@ -18551,7 +18543,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 						if (!_tmp85_) {
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 18555 "Commands.c"
+#line 18547 "Commands.c"
 						}
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp86_ = _source_it;
@@ -18567,11 +18559,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 						tag_attach (_tmp88_, _tmp89_);
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (source);
-#line 18571 "Commands.c"
+#line 18563 "Commands.c"
 					}
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_source_it);
-#line 18575 "Commands.c"
+#line 18567 "Commands.c"
 				}
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (to_child);
@@ -18579,7 +18571,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_g_free0 (child_subpath);
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (from_child);
-#line 18583 "Commands.c"
+#line 18575 "Commands.c"
 			}
 		}
 	}
@@ -18589,7 +18581,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_g_object_unref0 (to_tag);
 #line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 18593 "Commands.c"
+#line 18585 "Commands.c"
 }
 
 
@@ -18626,7 +18618,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_tmp2_ = victim_path;
 #line 2070 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ == NULL) {
-#line 18630 "Commands.c"
+#line 18622 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 #line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18637,7 +18629,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 		_g_free0 (victim_path);
 #line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
 		victim_path = _tmp4_;
-#line 18641 "Commands.c"
+#line 18633 "Commands.c"
 	}
 #line 2073 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = tag_global;
@@ -18651,7 +18643,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 		_g_free0 (victim_path);
 #line 2074 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 18655 "Commands.c"
+#line 18647 "Commands.c"
 	}
 #line 2076 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = victim_path;
@@ -18665,19 +18657,19 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_tmp11_ = tag_get_hierarchical_children (_tmp10_);
 #line 2079 "/home/jens/Source/shotwell/src/Commands.vala"
 	victim_children = _tmp11_;
-#line 18669 "Commands.c"
+#line 18661 "Commands.c"
 	{
 		gint i = 0;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 18674 "Commands.c"
+#line 18666 "Commands.c"
 		{
 			gboolean _tmp12_ = FALSE;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp12_ = TRUE;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18681 "Commands.c"
+#line 18673 "Commands.c"
 				gint _tmp14_;
 				GeeList* _tmp15_;
 				gint _tmp16_;
@@ -18692,13 +18684,13 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				Marker* _tmp25_;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp12_) {
-#line 18696 "Commands.c"
+#line 18688 "Commands.c"
 					gint _tmp13_;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp13_ = i;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp13_ + 1;
-#line 18702 "Commands.c"
+#line 18694 "Commands.c"
 				}
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp12_ = FALSE;
@@ -18714,7 +18706,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				if (!(_tmp14_ < _tmp17_)) {
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18718 "Commands.c"
+#line 18710 "Commands.c"
 				}
 #line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp18_ = tag_global;
@@ -18738,7 +18730,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				_g_object_unref0 (_tmp25_);
 #line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp23_);
-#line 18742 "Commands.c"
+#line 18734 "Commands.c"
 			}
 		}
 	}
@@ -18762,7 +18754,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_g_object_unref0 (victim);
 #line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (victim_path);
-#line 18766 "Commands.c"
+#line 18758 "Commands.c"
 }
 
 
@@ -18775,7 +18767,7 @@ static void reparent_tag_command_real_execute (Command* base) {
 	_tmp0_ = self->priv->after_state;
 #line 2088 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 18779 "Commands.c"
+#line 18771 "Commands.c"
 		const gchar* _tmp1_;
 		const gchar* _tmp2_;
 		const gchar* _tmp3_;
@@ -18800,7 +18792,7 @@ static void reparent_tag_command_real_execute (Command* base) {
 		_tmp4_ = self->priv->from_path;
 #line 2099 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp4_);
-#line 18804 "Commands.c"
+#line 18796 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 		const gchar* _tmp6_;
@@ -18831,7 +18823,7 @@ static void reparent_tag_command_real_execute (Command* base) {
 		_tmp9_ = self->priv->from_path;
 #line 2111 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp9_);
-#line 18835 "Commands.c"
+#line 18827 "Commands.c"
 	}
 }
 
@@ -18863,13 +18855,13 @@ static void reparent_tag_command_real_undo (Command* base) {
 	_tmp2_ = self->priv->to_path_exists;
 #line 2122 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 18867 "Commands.c"
+#line 18859 "Commands.c"
 		const gchar* _tmp3_;
 #line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->to_path;
 #line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp3_);
-#line 18873 "Commands.c"
+#line 18865 "Commands.c"
 	}
 #line 2125 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->from_path;
@@ -18897,13 +18889,13 @@ static void reparent_tag_command_real_undo (Command* base) {
 	_tmp9_ = self->priv->to_path_parent_path;
 #line 2133 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp9_ != NULL) {
-#line 18901 "Commands.c"
+#line 18893 "Commands.c"
 		const gchar* _tmp10_;
 #line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = self->priv->to_path_parent_path;
 #line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
 		hierarchical_tag_utilities_cleanup_root_path (_tmp10_);
-#line 18907 "Commands.c"
+#line 18899 "Commands.c"
 	}
 }
 
@@ -18919,7 +18911,7 @@ static void reparent_tag_command_class_init (ReparentTagCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) reparent_tag_command_real_undo;
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = reparent_tag_command_finalize;
-#line 18923 "Commands.c"
+#line 18915 "Commands.c"
 }
 
 
@@ -18949,7 +18941,7 @@ static void reparent_tag_command_instance_init (ReparentTagCommand * self) {
 	self->priv->existing_dest_membership = NULL;
 #line 1692 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->to_path_exists = FALSE;
-#line 18953 "Commands.c"
+#line 18945 "Commands.c"
 }
 
 
@@ -18999,7 +18991,7 @@ static void reparent_tag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->existing_dest_membership);
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (reparent_tag_command_parent_class)->finalize (obj);
-#line 19003 "Commands.c"
+#line 18995 "Commands.c"
 }
 
 
@@ -19018,7 +19010,7 @@ GType reparent_tag_command_get_type (void) {
 static void _modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 2179 "/home/jens/Source/shotwell/src/Commands.vala"
 	modify_tags_command_on_proxy_broken ((ModifyTagsCommand*) self);
-#line 19022 "Commands.c"
+#line 19014 "Commands.c"
 }
 
 
@@ -19062,7 +19054,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 	_tmp6_ = original_tags;
 #line 2150 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 19066 "Commands.c"
+#line 19058 "Commands.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp7_;
@@ -19090,7 +19082,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_tag_index = -1;
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 19094 "Commands.c"
+#line 19086 "Commands.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gint _tmp14_;
@@ -19116,7 +19108,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 				if (!(_tmp13_ < _tmp14_)) {
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 19120 "Commands.c"
+#line 19112 "Commands.c"
 				}
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp15_ = _tag_list;
@@ -19146,18 +19138,18 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 				_source_proxy_unref0 (proxy);
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (tag);
-#line 19150 "Commands.c"
+#line 19142 "Commands.c"
 			}
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tag_list);
-#line 19154 "Commands.c"
+#line 19146 "Commands.c"
 		}
 	}
 #line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
 	new_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 19161 "Commands.c"
+#line 19153 "Commands.c"
 	{
 		GeeIterator* _new_tag_it = NULL;
 		GeeCollection* _tmp24_;
@@ -19170,7 +19162,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 		_new_tag_it = _tmp25_;
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19174 "Commands.c"
+#line 19166 "Commands.c"
 			GeeIterator* _tmp26_;
 			gboolean _tmp27_;
 			Tag* new_tag = NULL;
@@ -19193,7 +19185,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			if (!_tmp27_) {
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19197 "Commands.c"
+#line 19189 "Commands.c"
 			}
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp28_ = _new_tag_it;
@@ -19229,11 +19221,11 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_g_free0 (new_tag_path);
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (new_tag);
-#line 19233 "Commands.c"
+#line 19225 "Commands.c"
 		}
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_new_tag_it);
-#line 19237 "Commands.c"
+#line 19229 "Commands.c"
 	}
 	{
 		GeeIterator* _path_it = NULL;
@@ -19247,7 +19239,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 		_path_it = _tmp39_;
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19251 "Commands.c"
+#line 19243 "Commands.c"
 			GeeIterator* _tmp40_;
 			gboolean _tmp41_;
 			gchar* path = NULL;
@@ -19273,7 +19265,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			if (!_tmp41_) {
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19277 "Commands.c"
+#line 19269 "Commands.c"
 			}
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp42_ = _path_it;
@@ -19317,11 +19309,11 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_source_proxy_unref0 (proxy);
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (path);
-#line 19321 "Commands.c"
+#line 19313 "Commands.c"
 		}
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_path_it);
-#line 19325 "Commands.c"
+#line 19317 "Commands.c"
 	}
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (new_paths);
@@ -19329,14 +19321,14 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 	_g_object_unref0 (original_tags);
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 19333 "Commands.c"
+#line 19325 "Commands.c"
 }
 
 
 ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list) {
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	return modify_tags_command_construct (TYPE_MODIFY_TAGS_COMMAND, media, new_tag_list);
-#line 19340 "Commands.c"
+#line 19332 "Commands.c"
 }
 
 
@@ -19344,7 +19336,7 @@ static void modify_tags_command_real_execute (Command* base) {
 	ModifyTagsCommand * self;
 #line 2185 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19348 "Commands.c"
+#line 19340 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
 		GeeArrayList* _tmp0_;
@@ -19372,7 +19364,7 @@ static void modify_tags_command_real_execute (Command* base) {
 		_proxy_index = -1;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19376 "Commands.c"
+#line 19368 "Commands.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -19398,7 +19390,7 @@ static void modify_tags_command_real_execute (Command* base) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19402 "Commands.c"
+#line 19394 "Commands.c"
 			}
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19426,11 +19418,11 @@ static void modify_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp13_);
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19430 "Commands.c"
+#line 19422 "Commands.c"
 		}
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19434 "Commands.c"
+#line 19426 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
@@ -19459,7 +19451,7 @@ static void modify_tags_command_real_execute (Command* base) {
 		_proxy_index = -1;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19463 "Commands.c"
+#line 19455 "Commands.c"
 			gint _tmp22_;
 			gint _tmp23_;
 			gint _tmp24_;
@@ -19483,7 +19475,7 @@ static void modify_tags_command_real_execute (Command* base) {
 			if (!(_tmp23_ < _tmp24_)) {
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19487 "Commands.c"
+#line 19479 "Commands.c"
 			}
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _proxy_list;
@@ -19507,11 +19499,11 @@ static void modify_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp30_);
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19511 "Commands.c"
+#line 19503 "Commands.c"
 		}
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19515 "Commands.c"
+#line 19507 "Commands.c"
 	}
 }
 
@@ -19520,7 +19512,7 @@ static void modify_tags_command_real_undo (Command* base) {
 	ModifyTagsCommand * self;
 #line 2193 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19524 "Commands.c"
+#line 19516 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
 		GeeArrayList* _tmp0_;
@@ -19548,7 +19540,7 @@ static void modify_tags_command_real_undo (Command* base) {
 		_proxy_index = -1;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19552 "Commands.c"
+#line 19544 "Commands.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -19574,7 +19566,7 @@ static void modify_tags_command_real_undo (Command* base) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19578 "Commands.c"
+#line 19570 "Commands.c"
 			}
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19602,11 +19594,11 @@ static void modify_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (_tmp13_);
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19606 "Commands.c"
+#line 19598 "Commands.c"
 		}
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19610 "Commands.c"
+#line 19602 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
@@ -19635,7 +19627,7 @@ static void modify_tags_command_real_undo (Command* base) {
 		_proxy_index = -1;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19639 "Commands.c"
+#line 19631 "Commands.c"
 			gint _tmp22_;
 			gint _tmp23_;
 			gint _tmp24_;
@@ -19659,7 +19651,7 @@ static void modify_tags_command_real_undo (Command* base) {
 			if (!(_tmp23_ < _tmp24_)) {
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19663 "Commands.c"
+#line 19655 "Commands.c"
 			}
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _proxy_list;
@@ -19683,11 +19675,11 @@ static void modify_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (_tmp30_);
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19687 "Commands.c"
+#line 19679 "Commands.c"
 		}
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19691 "Commands.c"
+#line 19683 "Commands.c"
 	}
 }
 
@@ -19705,7 +19697,7 @@ static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 2202 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 19709 "Commands.c"
+#line 19701 "Commands.c"
 }
 
 
@@ -19720,7 +19712,7 @@ static void modify_tags_command_class_init (ModifyTagsCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) modify_tags_command_real_undo;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = modify_tags_command_finalize;
-#line 19724 "Commands.c"
+#line 19716 "Commands.c"
 }
 
 
@@ -19737,7 +19729,7 @@ static void modify_tags_command_instance_init (ModifyTagsCommand * self) {
 	_tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 2141 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->to_remove = _tmp1_;
-#line 19741 "Commands.c"
+#line 19733 "Commands.c"
 }
 
 
@@ -19745,7 +19737,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 	ModifyTagsCommand * self;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19749 "Commands.c"
+#line 19741 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
 		GeeArrayList* _tmp0_;
@@ -19773,7 +19765,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 		_proxy_index = -1;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19777 "Commands.c"
+#line 19769 "Commands.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -19795,7 +19787,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19799 "Commands.c"
+#line 19791 "Commands.c"
 			}
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19813,11 +19805,11 @@ static void modify_tags_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19817 "Commands.c"
+#line 19809 "Commands.c"
 		}
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19821 "Commands.c"
+#line 19813 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
@@ -19846,7 +19838,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 		_proxy_index = -1;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19850 "Commands.c"
+#line 19842 "Commands.c"
 			gint _tmp18_;
 			gint _tmp19_;
 			gint _tmp20_;
@@ -19868,7 +19860,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 			if (!(_tmp19_ < _tmp20_)) {
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19872 "Commands.c"
+#line 19864 "Commands.c"
 			}
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp21_ = _proxy_list;
@@ -19886,11 +19878,11 @@ static void modify_tags_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19890 "Commands.c"
+#line 19882 "Commands.c"
 		}
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19894 "Commands.c"
+#line 19886 "Commands.c"
 	}
 #line 2139 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->media);
@@ -19900,7 +19892,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->to_remove);
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (modify_tags_command_parent_class)->finalize (obj);
-#line 19904 "Commands.c"
+#line 19896 "Commands.c"
 }
 
 
@@ -19919,7 +19911,7 @@ GType modify_tags_command_get_type (void) {
 static void _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 2226 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag_untag_photos_command_on_source_destroyed ((TagUntagPhotosCommand*) self, source);
-#line 19923 "Commands.c"
+#line 19915 "Commands.c"
 }
 
 
@@ -19944,7 +19936,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 	_tmp1_ = attach;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 19948 "Commands.c"
+#line 19940 "Commands.c"
 		Tag* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
@@ -19966,7 +19958,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 		_tmp0_ = _tmp6_;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp4_);
-#line 19970 "Commands.c"
+#line 19962 "Commands.c"
 	} else {
 		Tag* _tmp7_;
 		gchar* _tmp8_;
@@ -19989,7 +19981,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 		_tmp0_ = _tmp11_;
 #line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp9_);
-#line 19993 "Commands.c"
+#line 19985 "Commands.c"
 	}
 #line 2213 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp12_ = tag;
@@ -20027,14 +20019,14 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 	_g_free0 (_tmp0_);
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20031 "Commands.c"
+#line 20023 "Commands.c"
 }
 
 
 TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach) {
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
 	return tag_untag_photos_command_construct (TYPE_TAG_UNTAG_PHOTOS_COMMAND, tag, sources, count, attach);
-#line 20038 "Commands.c"
+#line 20030 "Commands.c"
 }
 
 
@@ -20049,20 +20041,20 @@ static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableComm
 	_tmp0_ = self->priv->attach;
 #line 2231 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 20053 "Commands.c"
+#line 20045 "Commands.c"
 		DataSource* _tmp1_;
 #line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = source;
 #line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20059 "Commands.c"
+#line 20051 "Commands.c"
 	} else {
 		DataSource* _tmp2_;
 #line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = source;
 #line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20066 "Commands.c"
+#line 20058 "Commands.c"
 	}
 }
 
@@ -20078,20 +20070,20 @@ static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand
 	_tmp0_ = self->priv->attach;
 #line 2238 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 20082 "Commands.c"
+#line 20074 "Commands.c"
 		DataSource* _tmp1_;
 #line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = source;
 #line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20088 "Commands.c"
+#line 20080 "Commands.c"
 	} else {
 		DataSource* _tmp2_;
 #line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = source;
 #line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20095 "Commands.c"
+#line 20087 "Commands.c"
 	}
 }
 
@@ -20106,7 +20098,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 	_tmp0_ = self->priv->detached_from;
 #line 2246 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 20110 "Commands.c"
+#line 20102 "Commands.c"
 		Tag* _tmp1_;
 		GeeCollection* _tmp2_;
 		GeeArrayList* _tmp3_;
@@ -20133,7 +20125,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 		curr_tmp = _tmp5_;
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 20137 "Commands.c"
+#line 20129 "Commands.c"
 			Tag* _tmp6_;
 			GeeList* _tmp7_;
 			Tag* _tmp8_;
@@ -20145,7 +20137,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			if (!(_tmp6_ != NULL)) {
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 20149 "Commands.c"
+#line 20141 "Commands.c"
 			}
 #line 2254 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = self->priv->attached_to;
@@ -20161,13 +20153,13 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			_g_object_unref0 (curr_tmp);
 #line 2255 "/home/jens/Source/shotwell/src/Commands.vala"
 			curr_tmp = _tmp10_;
-#line 20165 "Commands.c"
+#line 20157 "Commands.c"
 		}
 #line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (curr_tmp);
 #line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 20171 "Commands.c"
+#line 20163 "Commands.c"
 	}
 	{
 		GeeIterator* _detached_tag_it = NULL;
@@ -20192,7 +20184,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 		_detached_tag_it = _tmp15_;
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 20196 "Commands.c"
+#line 20188 "Commands.c"
 			GeeIterator* _tmp16_;
 			gboolean _tmp17_;
 			Tag* detached_tag = NULL;
@@ -20211,7 +20203,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			if (!_tmp17_) {
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 20215 "Commands.c"
+#line 20207 "Commands.c"
 			}
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = _detached_tag_it;
@@ -20235,11 +20227,11 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			_g_object_unref0 (_tmp24_);
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (detached_tag);
-#line 20239 "Commands.c"
+#line 20231 "Commands.c"
 		}
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_detached_tag_it);
-#line 20243 "Commands.c"
+#line 20235 "Commands.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->detached_from);
@@ -20247,7 +20239,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 	self->priv->detached_from = NULL;
 #line 2266 "/home/jens/Source/shotwell/src/Commands.vala"
 	simple_proxyable_command_clear_added_proxies (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand));
-#line 20251 "Commands.c"
+#line 20243 "Commands.c"
 }
 
 
@@ -20261,7 +20253,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 	_tmp0_ = self->priv->attached_to;
 #line 2270 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 20265 "Commands.c"
+#line 20257 "Commands.c"
 		Tag* _tmp1_;
 		GeeCollection* _tmp2_;
 		GeeMultiMap* _tmp3_;
@@ -20288,7 +20280,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 		simple_proxyable_command_add_proxyables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 2278 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 20292 "Commands.c"
+#line 20284 "Commands.c"
 	} else {
 		{
 			GeeList* _t_list = NULL;
@@ -20317,7 +20309,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 			_t_index = -1;
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 20321 "Commands.c"
+#line 20313 "Commands.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gint _tmp14_;
@@ -20337,7 +20329,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 				if (!(_tmp13_ < _tmp14_)) {
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 20341 "Commands.c"
+#line 20333 "Commands.c"
 				}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp15_ = _t_list;
@@ -20347,7 +20339,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 				_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				t = (Tag*) _tmp17_;
-#line 20351 "Commands.c"
+#line 20343 "Commands.c"
 				{
 					GeeIterator* _ms_it = NULL;
 					GeeCollection* _tmp18_;
@@ -20360,7 +20352,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 					_ms_it = _tmp19_;
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 20364 "Commands.c"
+#line 20356 "Commands.c"
 						GeeIterator* _tmp20_;
 						gboolean _tmp21_;
 						MediaSource* ms = NULL;
@@ -20377,7 +20369,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 						if (!_tmp21_) {
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 20381 "Commands.c"
+#line 20373 "Commands.c"
 						}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp22_ = _ms_it;
@@ -20393,7 +20385,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 						_tmp26_ = tag_get_attachment_count (_tmp24_, _tmp25_);
 #line 2283 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp26_ < 2) {
-#line 20397 "Commands.c"
+#line 20389 "Commands.c"
 							Tag* _tmp27_;
 							MediaSource* _tmp28_;
 							GeeList* _tmp29_;
@@ -20408,23 +20400,23 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 							_tmp30_ = _tmp29_;
 #line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_tmp30_);
-#line 20412 "Commands.c"
+#line 20404 "Commands.c"
 						}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (ms);
-#line 20416 "Commands.c"
+#line 20408 "Commands.c"
 					}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_ms_it);
-#line 20420 "Commands.c"
+#line 20412 "Commands.c"
 				}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (t);
-#line 20424 "Commands.c"
+#line 20416 "Commands.c"
 			}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_t_list);
-#line 20428 "Commands.c"
+#line 20420 "Commands.c"
 		}
 	}
 }
@@ -20459,7 +20451,7 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
 	_tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2294 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_) {
-#line 20463 "Commands.c"
+#line 20455 "Commands.c"
 		CommandManager* _tmp6_;
 		CommandManager* _tmp7_;
 #line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20470,7 +20462,7 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
 		command_manager_reset (_tmp7_);
 #line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp7_);
-#line 20474 "Commands.c"
+#line 20466 "Commands.c"
 	}
 }
 
@@ -20486,7 +20478,7 @@ static void tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * kl
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) tag_untag_photos_command_real_undo_on_source;
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = tag_untag_photos_command_finalize;
-#line 20490 "Commands.c"
+#line 20482 "Commands.c"
 }
 
 
@@ -20497,7 +20489,7 @@ static void tag_untag_photos_command_instance_init (TagUntagPhotosCommand * self
 	self->priv->detached_from = NULL;
 #line 2210 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->attached_to = NULL;
-#line 20501 "Commands.c"
+#line 20493 "Commands.c"
 }
 
 
@@ -20529,7 +20521,7 @@ static void tag_untag_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->attached_to);
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (tag_untag_photos_command_parent_class)->finalize (obj);
-#line 20533 "Commands.c"
+#line 20525 "Commands.c"
 }
 
 
@@ -20621,14 +20613,14 @@ RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_ty
 	self->priv->new_name = _tmp15_;
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20625 "Commands.c"
+#line 20617 "Commands.c"
 }
 
 
 RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name) {
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_saved_search_command_construct (TYPE_RENAME_SAVED_SEARCH_COMMAND, search, new_name);
-#line 20632 "Commands.c"
+#line 20624 "Commands.c"
 }
 
 
@@ -20647,7 +20639,7 @@ static void rename_saved_search_command_real_execute (Command* base) {
 	_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
 #line 2313 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 20651 "Commands.c"
+#line 20643 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -20661,7 +20653,7 @@ static void rename_saved_search_command_real_execute (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 20665 "Commands.c"
+#line 20657 "Commands.c"
 	}
 }
 
@@ -20681,7 +20673,7 @@ static void rename_saved_search_command_real_undo (Command* base) {
 	_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
 #line 2318 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 20685 "Commands.c"
+#line 20677 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -20695,7 +20687,7 @@ static void rename_saved_search_command_real_undo (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 20699 "Commands.c"
+#line 20691 "Commands.c"
 	}
 }
 
@@ -20711,14 +20703,14 @@ static void rename_saved_search_command_class_init (RenameSavedSearchCommandClas
 	((CommandClass *) klass)->undo = (void (*) (Command *)) rename_saved_search_command_real_undo;
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_saved_search_command_finalize;
-#line 20715 "Commands.c"
+#line 20707 "Commands.c"
 }
 
 
 static void rename_saved_search_command_instance_init (RenameSavedSearchCommand * self) {
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20722 "Commands.c"
+#line 20714 "Commands.c"
 }
 
 
@@ -20734,7 +20726,7 @@ static void rename_saved_search_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->new_name);
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_saved_search_command_parent_class)->finalize (obj);
-#line 20738 "Commands.c"
+#line 20730 "Commands.c"
 }
 
 
@@ -20801,14 +20793,14 @@ DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_ty
 	self->priv->search = _tmp10_;
 #line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20805 "Commands.c"
+#line 20797 "Commands.c"
 }
 
 
 DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search) {
 #line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
 	return delete_saved_search_command_construct (TYPE_DELETE_SAVED_SEARCH_COMMAND, search);
-#line 20812 "Commands.c"
+#line 20804 "Commands.c"
 }
 
 
@@ -20829,7 +20821,7 @@ static void delete_saved_search_command_real_execute (Command* base) {
 	saved_search_table_remove (_tmp1_, _tmp2_);
 #line 2333 "/home/jens/Source/shotwell/src/Commands.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 20833 "Commands.c"
+#line 20825 "Commands.c"
 }
 
 
@@ -20842,7 +20834,7 @@ static void delete_saved_search_command_real_undo (Command* base) {
 	_tmp0_ = self->priv->search;
 #line 2337 "/home/jens/Source/shotwell/src/Commands.vala"
 	saved_search_reconstitute (_tmp0_);
-#line 20846 "Commands.c"
+#line 20838 "Commands.c"
 }
 
 
@@ -20857,14 +20849,14 @@ static void delete_saved_search_command_class_init (DeleteSavedSearchCommandClas
 	((CommandClass *) klass)->undo = (void (*) (Command *)) delete_saved_search_command_real_undo;
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = delete_saved_search_command_finalize;
-#line 20861 "Commands.c"
+#line 20853 "Commands.c"
 }
 
 
 static void delete_saved_search_command_instance_init (DeleteSavedSearchCommand * self) {
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20868 "Commands.c"
+#line 20860 "Commands.c"
 }
 
 
@@ -20876,7 +20868,7 @@ static void delete_saved_search_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->search);
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (delete_saved_search_command_parent_class)->finalize (obj);
-#line 20880 "Commands.c"
+#line 20872 "Commands.c"
 }
 
 
@@ -20895,7 +20887,7 @@ GType delete_saved_search_command_get_type (void) {
 static void _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 2358 "/home/jens/Source/shotwell/src/Commands.vala"
 	trash_untrash_photos_command_on_photo_destroyed ((TrashUntrashPhotosCommand*) self, source);
-#line 20899 "Commands.c"
+#line 20891 "Commands.c"
 }
 
 
@@ -20918,11 +20910,11 @@ TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_
 	if (_tmp1_) {
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Move Photos to Trash");
-#line 20922 "Commands.c"
+#line 20914 "Commands.c"
 	} else {
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Restore Photos from Trash");
-#line 20926 "Commands.c"
+#line 20918 "Commands.c"
 	}
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = to_trash;
@@ -20930,11 +20922,11 @@ TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_
 	if (_tmp3_) {
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Move the photos to the Shotwell trash");
-#line 20934 "Commands.c"
+#line 20926 "Commands.c"
 	} else {
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Restore the photos back to the Shotwell library");
-#line 20938 "Commands.c"
+#line 20930 "Commands.c"
 	}
 #line 2346 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp2_);
@@ -20960,14 +20952,14 @@ TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
 #line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20964 "Commands.c"
+#line 20956 "Commands.c"
 }
 
 
 TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash) {
 #line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
 	return trash_untrash_photos_command_construct (TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, sources, to_trash);
-#line 20971 "Commands.c"
+#line 20963 "Commands.c"
 }
 
 
@@ -21002,7 +20994,7 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
 		result = NULL;
 #line 2364 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 21006 "Commands.c"
+#line 20998 "Commands.c"
 	}
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = to_trash;
@@ -21010,11 +21002,11 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
 	if (_tmp4_) {
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = _ ("Moving Photos to Trash");
-#line 21014 "Commands.c"
+#line 21006 "Commands.c"
 	} else {
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = _ ("Restoring Photos From Trash");
-#line 21018 "Commands.c"
+#line 21010 "Commands.c"
 	}
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = app_window_get_instance ();
@@ -21046,7 +21038,7 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
 	result = dialog;
 #line 2370 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 21050 "Commands.c"
+#line 21042 "Commands.c"
 }
 
 
@@ -21055,7 +21047,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 21059 "Commands.c"
+#line 21051 "Commands.c"
 }
 
 
@@ -21088,7 +21080,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 	_tmp2_ = dialog;
 #line 2377 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21092 "Commands.c"
+#line 21084 "Commands.c"
 		ProgressDialog* _tmp3_;
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = dialog;
@@ -21106,13 +21098,13 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 		monitor_target = g_object_ref (_tmp3_);
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21110 "Commands.c"
+#line 21102 "Commands.c"
 	}
 #line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->to_trash;
 #line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 21116 "Commands.c"
+#line 21108 "Commands.c"
 		ProgressMonitor _tmp5_;
 		void* _tmp5__target;
 #line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21121,7 +21113,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 		_tmp5__target = monitor_target;
 #line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_trash (self, _tmp5_, _tmp5__target);
-#line 21125 "Commands.c"
+#line 21117 "Commands.c"
 	} else {
 		ProgressMonitor _tmp6_;
 		void* _tmp6__target;
@@ -21131,19 +21123,19 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 		_tmp6__target = monitor_target;
 #line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_untrash (self, _tmp6_, _tmp6__target);
-#line 21135 "Commands.c"
+#line 21127 "Commands.c"
 	}
 #line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp7_ = dialog;
 #line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp7_ != NULL) {
-#line 21141 "Commands.c"
+#line 21133 "Commands.c"
 		ProgressDialog* _tmp8_;
 #line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = dialog;
 #line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp8_);
-#line 21147 "Commands.c"
+#line 21139 "Commands.c"
 	}
 #line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21155,7 +21147,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 	monitor_target_destroy_notify = NULL;
 #line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dialog);
-#line 21159 "Commands.c"
+#line 21151 "Commands.c"
 }
 
 
@@ -21188,7 +21180,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 	_tmp2_ = dialog;
 #line 2393 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21192 "Commands.c"
+#line 21184 "Commands.c"
 		ProgressDialog* _tmp3_;
 #line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = dialog;
@@ -21206,13 +21198,13 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 		monitor_target = g_object_ref (_tmp3_);
 #line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21210 "Commands.c"
+#line 21202 "Commands.c"
 	}
 #line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->to_trash;
 #line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 21216 "Commands.c"
+#line 21208 "Commands.c"
 		ProgressMonitor _tmp5_;
 		void* _tmp5__target;
 #line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21221,7 +21213,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 		_tmp5__target = monitor_target;
 #line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_untrash (self, _tmp5_, _tmp5__target);
-#line 21225 "Commands.c"
+#line 21217 "Commands.c"
 	} else {
 		ProgressMonitor _tmp6_;
 		void* _tmp6__target;
@@ -21231,19 +21223,19 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 		_tmp6__target = monitor_target;
 #line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_trash (self, _tmp6_, _tmp6__target);
-#line 21235 "Commands.c"
+#line 21227 "Commands.c"
 	}
 #line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp7_ = dialog;
 #line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp7_ != NULL) {
-#line 21241 "Commands.c"
+#line 21233 "Commands.c"
 		ProgressDialog* _tmp8_;
 #line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = dialog;
 #line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp8_);
-#line 21247 "Commands.c"
+#line 21239 "Commands.c"
 	}
 #line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21255,7 +21247,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 	monitor_target_destroy_notify = NULL;
 #line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dialog);
-#line 21259 "Commands.c"
+#line 21251 "Commands.c"
 }
 
 
@@ -21305,7 +21297,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 	_tmp8_ = _tmp7_;
 #line 2410 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_begin (_tmp8_);
-#line 21309 "Commands.c"
+#line 21301 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp9_;
@@ -21318,7 +21310,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 		_source_it = _tmp10_;
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21322 "Commands.c"
+#line 21314 "Commands.c"
 			GeeIterator* _tmp11_;
 			gboolean _tmp12_;
 			MediaSource* source = NULL;
@@ -21335,7 +21327,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 			if (!_tmp12_) {
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21339 "Commands.c"
+#line 21331 "Commands.c"
 			}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_it;
@@ -21353,7 +21345,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 			_tmp16__target = monitor_target;
 #line 2414 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 21357 "Commands.c"
+#line 21349 "Commands.c"
 				ProgressMonitor _tmp17_;
 				void* _tmp17__target;
 				gint _tmp18_;
@@ -21373,15 +21365,15 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 				_tmp20_ = count;
 #line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21377 "Commands.c"
+#line 21369 "Commands.c"
 			}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21381 "Commands.c"
+#line 21373 "Commands.c"
 		}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21385 "Commands.c"
+#line 21377 "Commands.c"
 	}
 #line 2418 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp21_ = library_photo_global;
@@ -21399,7 +21391,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 	_tmp26_ = _tmp25_;
 #line 2419 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_commit (_tmp26_);
-#line 21403 "Commands.c"
+#line 21395 "Commands.c"
 }
 
 
@@ -21449,7 +21441,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 	_tmp8_ = _tmp7_;
 #line 2427 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_begin (_tmp8_);
-#line 21453 "Commands.c"
+#line 21445 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp9_;
@@ -21462,7 +21454,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 		_source_it = _tmp10_;
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21466 "Commands.c"
+#line 21458 "Commands.c"
 			GeeIterator* _tmp11_;
 			gboolean _tmp12_;
 			MediaSource* source = NULL;
@@ -21479,7 +21471,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 			if (!_tmp12_) {
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21483 "Commands.c"
+#line 21475 "Commands.c"
 			}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_it;
@@ -21497,7 +21489,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 			_tmp16__target = monitor_target;
 #line 2431 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 21501 "Commands.c"
+#line 21493 "Commands.c"
 				ProgressMonitor _tmp17_;
 				void* _tmp17__target;
 				gint _tmp18_;
@@ -21517,15 +21509,15 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 				_tmp20_ = count;
 #line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21521 "Commands.c"
+#line 21513 "Commands.c"
 			}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21525 "Commands.c"
+#line 21517 "Commands.c"
 		}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21529 "Commands.c"
+#line 21521 "Commands.c"
 	}
 #line 2435 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp21_ = library_photo_global;
@@ -21543,7 +21535,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 	_tmp26_ = _tmp25_;
 #line 2436 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_commit (_tmp26_);
-#line 21547 "Commands.c"
+#line 21539 "Commands.c"
 }
 
 
@@ -21571,7 +21563,7 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
 	_tmp4_ = _tmp3_;
 #line 2446 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_ == 0) {
-#line 21575 "Commands.c"
+#line 21567 "Commands.c"
 		CommandManager* _tmp5_;
 		CommandManager* _tmp6_;
 #line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21582,7 +21574,7 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
 		command_manager_reset (_tmp6_);
 #line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 21586 "Commands.c"
+#line 21578 "Commands.c"
 	}
 }
 
@@ -21598,14 +21590,14 @@ static void trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandCl
 	((CommandClass *) klass)->undo = (void (*) (Command *)) trash_untrash_photos_command_real_undo;
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_untrash_photos_command_finalize;
-#line 21602 "Commands.c"
+#line 21594 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_instance_init (TrashUntrashPhotosCommand * self) {
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE (self);
-#line 21609 "Commands.c"
+#line 21601 "Commands.c"
 }
 
 
@@ -21633,7 +21625,7 @@ static void trash_untrash_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->sources);
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (trash_untrash_photos_command_parent_class)->finalize (obj);
-#line 21637 "Commands.c"
+#line 21629 "Commands.c"
 }
 
 
@@ -21668,11 +21660,11 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 	if (_tmp1_) {
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Flag");
-#line 21672 "Commands.c"
+#line 21664 "Commands.c"
 	} else {
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Unflag");
-#line 21676 "Commands.c"
+#line 21668 "Commands.c"
 	}
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = flag;
@@ -21680,11 +21672,11 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 	if (_tmp3_) {
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING;
-#line 21684 "Commands.c"
+#line 21676 "Commands.c"
 	} else {
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING;
-#line 21688 "Commands.c"
+#line 21680 "Commands.c"
 	}
 #line 2462 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = sources;
@@ -21702,7 +21694,7 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 	_tmp8_ = _tmp7_;
 #line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) {
-#line 21706 "Commands.c"
+#line 21698 "Commands.c"
 		const gchar* _tmp9_ = NULL;
 		gboolean _tmp10_;
 		ProgressDialog* _tmp11_;
@@ -21713,11 +21705,11 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 		if (_tmp10_) {
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS;
-#line 21717 "Commands.c"
+#line 21709 "Commands.c"
 		} else {
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS;
-#line 21721 "Commands.c"
+#line 21713 "Commands.c"
 		}
 #line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp11_ = progress_dialog_new (NULL, _tmp9_, NULL);
@@ -21731,18 +21723,18 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 		_tmp12_ = self->priv->progress_dialog;
 #line 2472 "/home/jens/Source/shotwell/src/Commands.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 21735 "Commands.c"
+#line 21727 "Commands.c"
 	}
 #line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 21739 "Commands.c"
+#line 21731 "Commands.c"
 }
 
 
 FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag) {
 #line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
 	return flag_unflag_command_construct (TYPE_FLAG_UNFLAG_COMMAND, sources, flag);
-#line 21746 "Commands.c"
+#line 21738 "Commands.c"
 }
 
 
@@ -21756,7 +21748,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 2477 "/home/jens/Source/shotwell/src/Commands.vala"
 	num_processed = 0;
-#line 21760 "Commands.c"
+#line 21752 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -21769,7 +21761,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 		_source_it = _tmp1_;
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21773 "Commands.c"
+#line 21765 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -21787,7 +21779,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 			if (!_tmp3_) {
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21791 "Commands.c"
+#line 21783 "Commands.c"
 			}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -21809,7 +21801,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 			_tmp9_ = self->priv->progress_dialog;
 #line 2484 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp9_ != NULL) {
-#line 21813 "Commands.c"
+#line 21805 "Commands.c"
 				ProgressDialog* _tmp10_;
 				gint _tmp11_;
 				GeeCollection* _tmp12_;
@@ -21834,27 +21826,27 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 				gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
 #line 2487 "/home/jens/Source/shotwell/src/Commands.vala"
 				spin_event_loop ();
-#line 21838 "Commands.c"
+#line 21830 "Commands.c"
 			}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21842 "Commands.c"
+#line 21834 "Commands.c"
 		}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21846 "Commands.c"
+#line 21838 "Commands.c"
 	}
 #line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = self->priv->progress_dialog;
 #line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp16_ != NULL) {
-#line 21852 "Commands.c"
+#line 21844 "Commands.c"
 		ProgressDialog* _tmp17_;
 #line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp17_ = self->priv->progress_dialog;
 #line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 21858 "Commands.c"
+#line 21850 "Commands.c"
 	}
 }
 
@@ -21865,7 +21857,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
 #line 2495 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 21869 "Commands.c"
+#line 21861 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -21878,7 +21870,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 		_source_it = _tmp1_;
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21882 "Commands.c"
+#line 21874 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -21894,7 +21886,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 			if (!_tmp3_) {
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21898 "Commands.c"
+#line 21890 "Commands.c"
 			}
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -21910,11 +21902,11 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 			flag_unflag_command_flag_unflag (self, _tmp6_, !_tmp7_);
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21914 "Commands.c"
+#line 21906 "Commands.c"
 		}
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21918 "Commands.c"
+#line 21910 "Commands.c"
 	}
 }
 
@@ -21938,31 +21930,31 @@ static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource
 	_tmp2_ = flaggable;
 #line 2502 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21942 "Commands.c"
+#line 21934 "Commands.c"
 		gboolean _tmp3_;
 #line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = flag;
 #line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 21948 "Commands.c"
+#line 21940 "Commands.c"
 			Flaggable* _tmp4_;
 #line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = flaggable;
 #line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
 			flaggable_mark_flagged (_tmp4_);
-#line 21954 "Commands.c"
+#line 21946 "Commands.c"
 		} else {
 			Flaggable* _tmp5_;
 #line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = flaggable;
 #line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
 			flaggable_mark_unflagged (_tmp5_);
-#line 21961 "Commands.c"
+#line 21953 "Commands.c"
 		}
 	}
 #line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (flaggable);
-#line 21966 "Commands.c"
+#line 21958 "Commands.c"
 }
 
 
@@ -21977,7 +21969,7 @@ static void flag_unflag_command_class_init (FlagUnflagCommandClass * klass) {
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) flag_unflag_command_real_undo_on_all;
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = flag_unflag_command_finalize;
-#line 21981 "Commands.c"
+#line 21973 "Commands.c"
 }
 
 
@@ -21986,7 +21978,7 @@ static void flag_unflag_command_instance_init (FlagUnflagCommand * self) {
 	self->priv = FLAG_UNFLAG_COMMAND_GET_PRIVATE (self);
 #line 2459 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->progress_dialog = NULL;
-#line 21990 "Commands.c"
+#line 21982 "Commands.c"
 }
 
 
@@ -21998,7 +21990,7 @@ static void flag_unflag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->progress_dialog);
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (flag_unflag_command_parent_class)->finalize (obj);
-#line 22002 "Commands.c"
+#line 21994 "Commands.c"
 }