Merge tag 'upstream/0.25.2'

Upstream version 0.25.2

1 files changed, 4801 insertions, 5120 deletions

diff --git a/src/Dialogs.c b/src/Dialogs.c
index 36504c7..3db0786 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1,4 +1,4 @@
-/* Dialogs.c generated by valac 0.34.2, the Vala compiler
+/* Dialogs.c generated by valac 0.32.1, the Vala compiler
  * generated from Dialogs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -17,9 +17,9 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <gee.h>
-#include <gdk/gdk.h>
 #include <float.h>
 #include <math.h>
+#include <gdk/gdk.h>
 #include <time.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gobject/gvaluecollector.h>
@@ -294,18 +294,6 @@ typedef struct _EntryMultiCompletion EntryMultiCompletion;
 typedef struct _EntryMultiCompletionClass EntryMultiCompletionClass;
 typedef struct _EntryMultiCompletionPrivate EntryMultiCompletionPrivate;
 
-#define TYPE_SET_BACKGROUND_DIALOG (set_background_dialog_get_type ())
-#define SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog))
-#define SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-#define IS_SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_DIALOG))
-#define IS_SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_DIALOG))
-#define SET_BACKGROUND_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-
-typedef struct _SetBackgroundDialog SetBackgroundDialog;
-typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass;
-typedef struct _SetBackgroundDialogPrivate SetBackgroundDialogPrivate;
-typedef struct _ParamSpecSetBackgroundDialog ParamSpecSetBackgroundDialog;
-
 #define TYPE_SET_BACKGROUND_PHOTO_DIALOG (set_background_photo_dialog_get_type ())
 #define SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog))
 #define SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
@@ -821,48 +809,34 @@ struct _EntryMultiCompletionPrivate {
 	gchar* delimiter;
 };
 
-struct _SetBackgroundDialog {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	SetBackgroundDialogPrivate * priv;
-	GtkDialog* dialog;
-	GtkCheckButton* desktop_background_button;
-	GtkCheckButton* screensaver_button;
-	GtkButton* ok_button;
-	gboolean desktop;
-	gboolean screensaver;
-};
-
-struct _SetBackgroundDialogClass {
-	GTypeClass parent_class;
-	void (*finalize) (SetBackgroundDialog *self);
-};
-
-struct _ParamSpecSetBackgroundDialog {
-	GParamSpec parent_instance;
-};
-
 struct _SetBackgroundPhotoDialog {
-	SetBackgroundDialog parent_instance;
+	GtkDialog parent_instance;
 	SetBackgroundPhotoDialogPrivate * priv;
 };
 
 struct _SetBackgroundPhotoDialogClass {
-	SetBackgroundDialogClass parent_class;
+	GtkDialogClass parent_class;
+};
+
+struct _SetBackgroundPhotoDialogPrivate {
+	GtkCheckButton* desktop_background_checkbox;
+	GtkCheckButton* screensaver_checkbox;
 };
 
 struct _SetBackgroundSlideshowDialog {
-	SetBackgroundDialog parent_instance;
+	GtkDialog parent_instance;
 	SetBackgroundSlideshowDialogPrivate * priv;
 };
 
 struct _SetBackgroundSlideshowDialogClass {
-	SetBackgroundDialogClass parent_class;
+	GtkDialogClass parent_class;
 };
 
 struct _SetBackgroundSlideshowDialogPrivate {
-	GtkLabel* delay_value_label;
+	GtkCheckButton* desktop_background_checkbox;
+	GtkCheckButton* screensaver_checkbox;
 	GtkScale* delay_scale;
+	GtkLabel* delay_value_label;
 	gint delay_value;
 };
 
@@ -1124,7 +1098,6 @@ static gpointer import_ui_question_params_parent_class = NULL;
 static gpointer text_entry_dialog_mediator_parent_class = NULL;
 static gpointer multi_text_entry_dialog_mediator_parent_class = NULL;
 static gpointer entry_multi_completion_parent_class = NULL;
-static gpointer set_background_dialog_parent_class = NULL;
 static gpointer set_background_photo_dialog_parent_class = NULL;
 static gpointer set_background_slideshow_dialog_parent_class = NULL;
 static gpointer text_entry_dialog_parent_class = NULL;
@@ -1358,28 +1331,17 @@ static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_fu
 static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter);
 static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter);
 static void entry_multi_completion_finalize (GObject* obj);
-gpointer set_background_dialog_ref (gpointer instance);
-void set_background_dialog_unref (gpointer instance);
-GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_set_background_dialog (GValue* value, gpointer v_object);
-void value_take_set_background_dialog (GValue* value, gpointer v_object);
-gpointer value_get_set_background_dialog (const GValue* value);
-GType set_background_dialog_get_type (void) G_GNUC_CONST;
-enum  {
-	SET_BACKGROUND_DIALOG_DUMMY_PROPERTY
-};
-SetBackgroundDialog* set_background_dialog_construct (GType object_type, GtkBuilder* builder);
-void set_background_dialog_on_checkbox_clicked (SetBackgroundDialog* self);
-static void _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-gboolean set_background_dialog_execute_base (SetBackgroundDialog* self);
-static void set_background_dialog_finalize (SetBackgroundDialog* obj);
 GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
+#define SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogPrivate))
 enum  {
 	SET_BACKGROUND_PHOTO_DIALOG_DUMMY_PROPERTY
 };
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
 SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
+static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self);
+static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
+static void set_background_photo_dialog_finalize (GObject* obj);
 GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST;
 #define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogPrivate))
 enum  {
@@ -1387,10 +1349,13 @@ enum  {
 };
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void);
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type);
+static void set_background_slideshow_dialog_real_constructed (GObject* base);
 static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self);
+static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self);
+static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
 gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver);
-static void set_background_slideshow_dialog_finalize (SetBackgroundDialog* obj);
+static void set_background_slideshow_dialog_finalize (GObject* obj);
 #define TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogPrivate))
 enum  {
 	TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
@@ -1750,7 +1715,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 		result = TRUE;
 #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 1754 "Dialogs.c"
+#line 1719 "Dialogs.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
@@ -1786,7 +1751,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 	_g_free0 (msg);
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1790 "Dialogs.c"
+#line 1755 "Dialogs.c"
 }
 
 
@@ -1832,7 +1797,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) {
 	_g_free0 (msg);
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1836 "Dialogs.c"
+#line 1801 "Dialogs.c"
 }
 
 
@@ -1886,7 +1851,7 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) {
 	_g_object_unref0 (dialog);
 #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1888 "Dialogs.c"
+#line 1853 "Dialogs.c"
 }
 
 
@@ -1922,7 +1887,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 1924 "Dialogs.c"
+#line 1889 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1933,7 +1898,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 1935 "Dialogs.c"
+#line 1900 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = current_file_basename;
@@ -1941,20 +1906,20 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp5_ = video_reader_is_supported_video_filename (_tmp4_);
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1943 "Dialogs.c"
+#line 1908 "Dialogs.c"
 		const gchar* _tmp6_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _ ("Export Video");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp6_;
-#line 1949 "Dialogs.c"
+#line 1914 "Dialogs.c"
 	} else {
 		const gchar* _tmp7_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _ ("Export Photo");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp7_;
-#line 1956 "Dialogs.c"
+#line 1921 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup (_tmp3_);
@@ -2010,7 +1975,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
 #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2012 "Dialogs.c"
+#line 1977 "Dialogs.c"
 		GtkFileChooserDialog* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
@@ -2039,7 +2004,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp29_;
-#line 2041 "Dialogs.c"
+#line 2006 "Dialogs.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = chooser;
@@ -2053,14 +2018,14 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_g_free0 (file_chooser_title);
 #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2055 "Dialogs.c"
+#line 2020 "Dialogs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2062 "Dialogs.c"
+#line 2027 "Dialogs.c"
 }
 
 
@@ -2087,7 +2052,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 2089 "Dialogs.c"
+#line 2054 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2098,19 +2063,19 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 2100 "Dialogs.c"
+#line 2065 "Dialogs.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = user_title;
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2106 "Dialogs.c"
+#line 2071 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Export Photos");
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_title = _tmp4_;
-#line 2112 "Dialogs.c"
+#line 2077 "Dialogs.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = user_title;
@@ -2152,7 +2117,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
 #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2154 "Dialogs.c"
+#line 2119 "Dialogs.c"
 		GtkFileChooserDialog* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
@@ -2181,7 +2146,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp22_;
-#line 2183 "Dialogs.c"
+#line 2148 "Dialogs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = chooser;
@@ -2193,7 +2158,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_g_object_unref0 (chooser);
 #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2195 "Dialogs.c"
+#line 2160 "Dialogs.c"
 }
 
 
@@ -2208,18 +2173,18 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 	if (g_error_matches (_tmp1_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 2210 "Dialogs.c"
+#line 2175 "Dialogs.c"
 	} else {
 		GError* _tmp2_ = NULL;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = err;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_PERM);
-#line 2217 "Dialogs.c"
+#line 2182 "Dialogs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 2221 "Dialogs.c"
+#line 2186 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
@@ -2261,7 +2226,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		_g_object_unref0 (_tmp8_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2262 "Dialogs.c"
+#line 2227 "Dialogs.c"
 	} else {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -2276,7 +2241,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		app_window_error_message (_tmp15_, NULL);
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp15_);
-#line 2277 "Dialogs.c"
+#line 2242 "Dialogs.c"
 	}
 }
 
@@ -2316,7 +2281,7 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_tmp6_ = photos_remaining;
 #line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 2317 "Dialogs.c"
+#line 2282 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -2341,14 +2306,14 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 		_tmp12_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, NULL, NULL);
 #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = _tmp12_;
-#line 2342 "Dialogs.c"
+#line 2307 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = message;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_window_error_message (_tmp13_, NULL);
-#line 2349 "Dialogs.c"
+#line 2314 "Dialogs.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
@@ -2356,42 +2321,42 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_g_free0 (message);
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2357 "Dialogs.c"
+#line 2322 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_constraint_changed ((ExportDialog*) self);
-#line 2364 "Dialogs.c"
+#line 2329 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_format_changed ((ExportDialog*) self);
-#line 2371 "Dialogs.c"
+#line 2336 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_changed ((ExportDialog*) self);
-#line 2378 "Dialogs.c"
+#line 2343 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
-#line 2385 "Dialogs.c"
+#line 2350 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
 #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_activate ((ExportDialog*) self);
-#line 2392 "Dialogs.c"
+#line 2357 "Dialogs.c"
 }
 
 
@@ -2475,11 +2440,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	if (_tmp2_) {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 2476 "Dialogs.c"
+#line 2441 "Dialogs.c"
 	} else {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 2480 "Dialogs.c"
+#line 2445 "Dialogs.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -2539,7 +2504,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->quality_combo = _tmp17_;
 #line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2540 "Dialogs.c"
+#line 2505 "Dialogs.c"
 	{
 		JpegQuality* quality_collection = NULL;
 		gint quality_collection_length1 = 0;
@@ -2551,11 +2516,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
-#line 2552 "Dialogs.c"
+#line 2517 "Dialogs.c"
 			JpegQuality quality = 0;
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			quality = quality_collection[quality_it];
-#line 2556 "Dialogs.c"
+#line 2521 "Dialogs.c"
 			{
 				GtkComboBoxText* _tmp18_ = NULL;
 				JpegQuality _tmp19_ = 0;
@@ -2585,7 +2550,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp24_ = _tmp23_.quality;
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp22_ == _tmp24_) {
-#line 2586 "Dialogs.c"
+#line 2551 "Dialogs.c"
 					GtkComboBoxText* _tmp25_ = NULL;
 					gint _tmp26_ = 0;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2594,13 +2559,13 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 					_tmp26_ = ctr;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
-#line 2595 "Dialogs.c"
+#line 2560 "Dialogs.c"
 				}
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = ctr;
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp27_ + 1;
-#line 2601 "Dialogs.c"
+#line 2566 "Dialogs.c"
 			}
 		}
 	}
@@ -2614,7 +2579,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->constraint_combo = _tmp28_;
 #line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2615 "Dialogs.c"
+#line 2580 "Dialogs.c"
 	{
 		ScaleConstraint* constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
@@ -2626,11 +2591,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
-#line 2627 "Dialogs.c"
+#line 2592 "Dialogs.c"
 			ScaleConstraint constraint = 0;
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			constraint = constraint_collection[constraint_it];
-#line 2631 "Dialogs.c"
+#line 2596 "Dialogs.c"
 			{
 				GtkComboBoxText* _tmp29_ = NULL;
 				ScaleConstraint _tmp30_ = 0;
@@ -2657,7 +2622,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp34_ = export_dialog_current_constraint;
 #line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 2658 "Dialogs.c"
+#line 2623 "Dialogs.c"
 					GtkComboBoxText* _tmp35_ = NULL;
 					gint _tmp36_ = 0;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2666,13 +2631,13 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 					_tmp36_ = ctr;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
-#line 2667 "Dialogs.c"
+#line 2632 "Dialogs.c"
 				}
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp37_ = ctr;
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp37_ + 1;
-#line 2673 "Dialogs.c"
+#line 2638 "Dialogs.c"
 			}
 		}
 	}
@@ -2690,7 +2655,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = photo_file_format_get_writeable (&_tmp39_);
-#line 2691 "Dialogs.c"
+#line 2656 "Dialogs.c"
 	{
 		PhotoFileFormat* format_collection = NULL;
 		gint format_collection_length1 = 0;
@@ -2702,11 +2667,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		format_collection_length1 = _tmp39_;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (format_it = 0; format_it < _tmp39_; format_it = format_it + 1) {
-#line 2703 "Dialogs.c"
+#line 2668 "Dialogs.c"
 			PhotoFileFormat format = 0;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			format = format_collection[format_it];
-#line 2707 "Dialogs.c"
+#line 2672 "Dialogs.c"
 			{
 				PhotoFileFormat _tmp41_ = 0;
 				PhotoFileFormatProperties* _tmp42_ = NULL;
@@ -2729,12 +2694,12 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_g_free0 (_tmp45_);
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_photo_file_format_properties_unref0 (_tmp43_);
-#line 2730 "Dialogs.c"
+#line 2695 "Dialogs.c"
 			}
 		}
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		format_collection = (g_free (format_collection), NULL);
-#line 2735 "Dialogs.c"
+#line 2700 "Dialogs.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = (GtkEntry*) gtk_entry_new ();
@@ -2892,7 +2857,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	_tmp85_ = export_dialog_current_constraint;
 #line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp85_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 2893 "Dialogs.c"
+#line 2858 "Dialogs.c"
 		GtkEntry* _tmp86_ = NULL;
 		GtkComboBoxText* _tmp87_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2903,7 +2868,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		_tmp87_ = self->priv->quality_combo;
 #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2904 "Dialogs.c"
+#line 2869 "Dialogs.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = self->priv->ok_button;
@@ -2913,14 +2878,14 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	_g_object_unref0 (config);
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 2914 "Dialogs.c"
+#line 2879 "Dialogs.c"
 }
 
 
 ExportDialog* export_dialog_new (const gchar* title) {
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
-#line 2921 "Dialogs.c"
+#line 2886 "Dialogs.c"
 }
 
 
@@ -2945,7 +2910,7 @@ static void export_dialog_format_add_option (ExportDialog* self, const gchar* fo
 	_tmp3_ = format_name;
 #line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
-#line 2946 "Dialogs.c"
+#line 2911 "Dialogs.c"
 }
 
 
@@ -2958,7 +2923,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 	g_return_if_fail (text != NULL);
 #line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	selection_ticker = 0;
-#line 2959 "Dialogs.c"
+#line 2924 "Dialogs.c"
 	{
 		GeeArrayList* _current_text_list = NULL;
 		GeeArrayList* _tmp0_ = NULL;
@@ -2986,7 +2951,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 		_current_text_index = -1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 2987 "Dialogs.c"
+#line 2952 "Dialogs.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -3009,7 +2974,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			if (!(_tmp6_ < _tmp7_)) {
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 3010 "Dialogs.c"
+#line 2975 "Dialogs.c"
 			}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _current_text_list;
@@ -3025,7 +2990,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			_tmp12_ = text;
 #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 3026 "Dialogs.c"
+#line 2991 "Dialogs.c"
 				GtkComboBoxText* _tmp13_ = NULL;
 				gint _tmp14_ = 0;
 #line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3040,7 +3005,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 				_g_object_unref0 (_current_text_list);
 #line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 3041 "Dialogs.c"
+#line 3006 "Dialogs.c"
 			}
 #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = selection_ticker;
@@ -3048,17 +3013,17 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			selection_ticker = _tmp15_ + 1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (current_text);
-#line 3049 "Dialogs.c"
+#line 3014 "Dialogs.c"
 		}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_text_list);
-#line 3053 "Dialogs.c"
+#line 3018 "Dialogs.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text;
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_error ("Dialogs.vala:278: format_set_active_text: text '%s' isn't in combo box", _tmp16_);
-#line 3059 "Dialogs.c"
+#line 3024 "Dialogs.c"
 }
 
 
@@ -3090,7 +3055,7 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
 #line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 3091 "Dialogs.c"
+#line 3056 "Dialogs.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = index;
@@ -3114,7 +3079,7 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	writeable_formats = (g_free (writeable_formats), NULL);
 #line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3115 "Dialogs.c"
+#line 3080 "Dialogs.c"
 }
 
 
@@ -3134,7 +3099,7 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 	switch (_tmp1_) {
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 3135 "Dialogs.c"
+#line 3100 "Dialogs.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3143,11 +3108,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3144 "Dialogs.c"
+#line 3109 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 3148 "Dialogs.c"
+#line 3113 "Dialogs.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3156,11 +3121,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3157 "Dialogs.c"
+#line 3122 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 3161 "Dialogs.c"
+#line 3126 "Dialogs.c"
 		{
 			ExportFormatParameters _tmp4_ = {0};
 			PhotoFileFormat _tmp5_ = 0;
@@ -3186,14 +3151,14 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3187 "Dialogs.c"
+#line 3152 "Dialogs.c"
 		}
 		default:
 		{
 #line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_error ("Dialogs.vala:303: get_label_for_parameters: unrecognized export format" \
 " mode");
-#line 3193 "Dialogs.c"
+#line 3158 "Dialogs.c"
 		}
 	}
 }
@@ -3225,7 +3190,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp1_ = _tmp0_.mode;
 #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
-#line 3225 "Dialogs.c"
+#line 3190 "Dialogs.c"
 		ScaleConstraint _tmp2_ = 0;
 		GtkComboBoxText* _tmp3_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3238,7 +3203,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp3_ = self->priv->constraint_combo;
 #line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 3238 "Dialogs.c"
+#line 3203 "Dialogs.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = *parameters;
@@ -3246,13 +3211,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp5_ = _tmp4_.mode;
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
-#line 3246 "Dialogs.c"
+#line 3211 "Dialogs.c"
 		ExportFormatParameters _tmp6_ = {0};
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = export_dialog_current_parameters;
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*parameters = _tmp6_;
-#line 3252 "Dialogs.c"
+#line 3217 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
 		ExportFormatParameters _tmp8_ = {0};
@@ -3263,7 +3228,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp9_ = _tmp8_.mode;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
-#line 3263 "Dialogs.c"
+#line 3228 "Dialogs.c"
 			ExportFormatParameters _tmp10_ = {0};
 			PhotoFileFormat _tmp11_ = 0;
 			gboolean _tmp12_ = FALSE;
@@ -3275,21 +3240,21 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp12_ = photo_file_format_can_write (_tmp11_);
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = !_tmp12_;
-#line 3275 "Dialogs.c"
+#line 3240 "Dialogs.c"
 		} else {
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = FALSE;
-#line 3279 "Dialogs.c"
+#line 3244 "Dialogs.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp7_) {
-#line 3283 "Dialogs.c"
+#line 3248 "Dialogs.c"
 			PhotoFileFormat _tmp13_ = 0;
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = photo_file_format_get_system_default_format ();
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).specified_format = _tmp13_;
-#line 3289 "Dialogs.c"
+#line 3254 "Dialogs.c"
 		}
 	}
 #line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3312,7 +3277,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp18_ = ok;
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp18_) {
-#line 3312 "Dialogs.c"
+#line 3277 "Dialogs.c"
 		gint index = 0;
 		GtkComboBoxText* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
@@ -3383,13 +3348,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp28_ = _vala_constraint;
 #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
-#line 3383 "Dialogs.c"
+#line 3348 "Dialogs.c"
 			gint _tmp29_ = 0;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = _vala_scale;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_assert (_tmp29_ > 0, "scale > 0");
-#line 3389 "Dialogs.c"
+#line 3354 "Dialogs.c"
 		}
 #line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = _vala_scale;
@@ -3403,7 +3368,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp34_ = _tmp33_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp34_) {
-#line 3403 "Dialogs.c"
+#line 3368 "Dialogs.c"
 			GtkSwitch* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			gboolean _tmp37_ = FALSE;
@@ -3415,11 +3380,11 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp37_ = _tmp36_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp37_;
-#line 3415 "Dialogs.c"
+#line 3380 "Dialogs.c"
 		} else {
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = FALSE;
-#line 3419 "Dialogs.c"
+#line 3384 "Dialogs.c"
 		}
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(*parameters).export_metadata = _tmp31_;
@@ -3435,7 +3400,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_g_free0 (_tmp40_);
 #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp41_) {
-#line 3435 "Dialogs.c"
+#line 3400 "Dialogs.c"
 			ExportFormatMode _tmp42_ = 0;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
@@ -3443,7 +3408,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp42_ = export_dialog_current_parameters.mode;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).mode = _tmp42_;
-#line 3443 "Dialogs.c"
+#line 3408 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp43_ = NULL;
 			gchar* _tmp44_ = NULL;
@@ -3461,7 +3426,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_g_free0 (_tmp45_);
 #line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp46_) {
-#line 3461 "Dialogs.c"
+#line 3426 "Dialogs.c"
 				ExportFormatMode _tmp47_ = 0;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
@@ -3469,7 +3434,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 				_tmp47_ = export_dialog_current_parameters.mode;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				(*parameters).mode = _tmp47_;
-#line 3469 "Dialogs.c"
+#line 3434 "Dialogs.c"
 			} else {
 				ExportFormatMode _tmp48_ = 0;
 				PhotoFileFormat _tmp49_ = 0;
@@ -3496,7 +3461,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 				_tmp52_ = _tmp51_.specified_format;
 #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3496 "Dialogs.c"
+#line 3461 "Dialogs.c"
 					GtkComboBoxText* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					JpegQuality _tmp55_ = 0;
@@ -3513,7 +3478,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 					_tmp56_ = export_dialog_current_parameters.quality;
 #line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					(*parameters).quality = _tmp56_;
-#line 3513 "Dialogs.c"
+#line 3478 "Dialogs.c"
 				}
 			}
 		}
@@ -3567,13 +3532,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (config);
-#line 3567 "Dialogs.c"
+#line 3532 "Dialogs.c"
 	} else {
 #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_scale = 0;
 #line 364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 3573 "Dialogs.c"
+#line 3538 "Dialogs.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -3583,17 +3548,17 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	if (scale) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*scale = _vala_scale;
-#line 3583 "Dialogs.c"
+#line 3548 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (constraint) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*constraint = _vala_constraint;
-#line 3589 "Dialogs.c"
+#line 3554 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3593 "Dialogs.c"
+#line 3558 "Dialogs.c"
 }
 
 
@@ -3639,7 +3604,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	_tmp5_ = widget;
 #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 3639 "Dialogs.c"
+#line 3604 "Dialogs.c"
 		GtkLabel* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3648,7 +3613,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 		_tmp7_ = widget;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
-#line 3648 "Dialogs.c"
+#line 3613 "Dialogs.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->table;
@@ -3662,7 +3627,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
 #line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (new_label);
-#line 3662 "Dialogs.c"
+#line 3627 "Dialogs.c"
 }
 
 
@@ -3705,7 +3670,7 @@ static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gi
 	_tmp7_ = y;
 #line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
-#line 3705 "Dialogs.c"
+#line 3670 "Dialogs.c"
 }
 
 
@@ -3773,17 +3738,17 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp14_ = original;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp14_) {
-#line 3773 "Dialogs.c"
+#line 3738 "Dialogs.c"
 		gboolean _tmp15_ = FALSE;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = jpeg;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_;
-#line 3779 "Dialogs.c"
+#line 3744 "Dialogs.c"
 	} else {
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 3783 "Dialogs.c"
+#line 3748 "Dialogs.c"
 	}
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->quality_combo;
@@ -3793,17 +3758,17 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp17_ = original;
 #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp17_) {
-#line 3793 "Dialogs.c"
+#line 3758 "Dialogs.c"
 		GtkWidget* _tmp18_ = NULL;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->ok_button;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (_tmp18_, TRUE);
-#line 3799 "Dialogs.c"
+#line 3764 "Dialogs.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_on_pixels_changed (self);
-#line 3803 "Dialogs.c"
+#line 3768 "Dialogs.c"
 	}
 }
 
@@ -3839,7 +3804,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 	_g_free0 (_tmp5_);
 #line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 3839 "Dialogs.c"
+#line 3804 "Dialogs.c"
 		GtkComboBoxText* _tmp7_ = NULL;
 		GtkComboBoxText* _tmp8_ = NULL;
 		GtkComboBoxText* _tmp9_ = NULL;
@@ -3870,7 +3835,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_tmp12_ = self->priv->export_metadata;
 #line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3870 "Dialogs.c"
+#line 3835 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -3888,7 +3853,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_g_free0 (_tmp15_);
 #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp16_) {
-#line 3888 "Dialogs.c"
+#line 3853 "Dialogs.c"
 			GtkComboBoxText* _tmp17_ = NULL;
 			GtkComboBoxText* _tmp18_ = NULL;
 			GtkEntry* _tmp19_ = NULL;
@@ -3912,7 +3877,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp21_ = self->priv->export_metadata;
 #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3912 "Dialogs.c"
+#line 3877 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp22_ = NULL;
 			gboolean jpeg = FALSE;
@@ -3933,17 +3898,17 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp25_ = original;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp25_) {
-#line 3933 "Dialogs.c"
+#line 3898 "Dialogs.c"
 				gboolean _tmp26_ = FALSE;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = jpeg;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = _tmp26_;
-#line 3939 "Dialogs.c"
+#line 3904 "Dialogs.c"
 			} else {
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = FALSE;
-#line 3943 "Dialogs.c"
+#line 3908 "Dialogs.c"
 			}
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = self->priv->quality_combo;
@@ -3953,7 +3918,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp28_ = self->priv->export_metadata;
 #line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3953 "Dialogs.c"
+#line 3918 "Dialogs.c"
 		}
 	}
 }
@@ -3964,7 +3929,7 @@ static void export_dialog_on_activate (ExportDialog* self) {
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 3964 "Dialogs.c"
+#line 3929 "Dialogs.c"
 }
 
 
@@ -3981,7 +3946,7 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (((gint) _tmp2_) > 0) {
-#line 3981 "Dialogs.c"
+#line 3946 "Dialogs.c"
 		GtkEntry* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -3993,17 +3958,17 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 		_tmp5_ = atoi (_tmp4_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_ > 0;
-#line 3993 "Dialogs.c"
+#line 3958 "Dialogs.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 3997 "Dialogs.c"
+#line 3962 "Dialogs.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->ok_button;
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (_tmp6_, _tmp0_);
-#line 4003 "Dialogs.c"
+#line 3968 "Dialogs.c"
 }
 
 
@@ -4011,17 +3976,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 4021 "Dialogs.c"
+#line 3986 "Dialogs.c"
 }
 
 
@@ -4044,7 +4009,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	if (_tmp0_) {
 #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 4044 "Dialogs.c"
+#line 4009 "Dialogs.c"
 	}
 #line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = TRUE;
@@ -4052,7 +4017,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp1_ = length;
 #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == -1) {
-#line 4052 "Dialogs.c"
+#line 4017 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
@@ -4064,25 +4029,25 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp4_ = _tmp3_;
 #line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		length = (gint) _tmp4_;
-#line 4064 "Dialogs.c"
+#line 4029 "Dialogs.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strdup ("");
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_text = _tmp5_;
-#line 4070 "Dialogs.c"
+#line 4035 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4075 "Dialogs.c"
+#line 4040 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4082 "Dialogs.c"
+#line 4047 "Dialogs.c"
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -4091,13 +4056,13 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				gboolean _tmp13_ = FALSE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 4091 "Dialogs.c"
+#line 4056 "Dialogs.c"
 					gint _tmp7_ = 0;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = ctr;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp7_ + 1;
-#line 4097 "Dialogs.c"
+#line 4062 "Dialogs.c"
 				}
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
@@ -4109,7 +4074,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				if (!(_tmp8_ < _tmp9_)) {
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4109 "Dialogs.c"
+#line 4074 "Dialogs.c"
 				}
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = text;
@@ -4121,7 +4086,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4121 "Dialogs.c"
+#line 4086 "Dialogs.c"
 					const gchar* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
@@ -4149,7 +4114,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 					new_text = _tmp20_;
 #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp19_);
-#line 4149 "Dialogs.c"
+#line 4114 "Dialogs.c"
 				}
 			}
 		}
@@ -4162,7 +4127,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp23_ = _tmp22_;
 #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 4162 "Dialogs.c"
+#line 4127 "Dialogs.c"
 		GtkEntry* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
@@ -4180,7 +4145,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp28_ = _tmp27_;
 #line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 4180 "Dialogs.c"
+#line 4145 "Dialogs.c"
 	}
 #line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->pixels_entry;
@@ -4190,7 +4155,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	self->priv->in_insert = FALSE;
 #line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (new_text);
-#line 4190 "Dialogs.c"
+#line 4155 "Dialogs.c"
 }
 
 
@@ -4208,7 +4173,7 @@ static void export_dialog_class_init (ExportDialogClass * klass) {
 	export_dialog_current_parameters = _tmp0_;
 #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
-#line 4208 "Dialogs.c"
+#line 4173 "Dialogs.c"
 }
 
 
@@ -4229,7 +4194,7 @@ static void export_dialog_instance_init (ExportDialog * self) {
 	self->priv->format_options = _tmp1_;
 #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = FALSE;
-#line 4229 "Dialogs.c"
+#line 4194 "Dialogs.c"
 }
 
 
@@ -4255,7 +4220,7 @@ static void export_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->ok_button);
 #line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
-#line 4255 "Dialogs.c"
+#line 4220 "Dialogs.c"
 }
 
 
@@ -4297,25 +4262,25 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 		result = NULL;
 #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4297 "Dialogs.c"
+#line 4262 "Dialogs.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup ("");
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	list = _tmp3_;
-#line 4303 "Dialogs.c"
+#line 4268 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4308 "Dialogs.c"
+#line 4273 "Dialogs.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = TRUE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4315 "Dialogs.c"
+#line 4280 "Dialogs.c"
 				gboolean _tmp6_ = FALSE;
 				gint _tmp7_ = 0;
 				const gchar* _tmp12_ = NULL;
@@ -4326,13 +4291,13 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				gchar* _tmp27_ = NULL;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 4326 "Dialogs.c"
+#line 4291 "Dialogs.c"
 					gint _tmp5_ = 0;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp5_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp5_ + 1;
-#line 4332 "Dialogs.c"
+#line 4297 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp4_ = FALSE;
@@ -4340,7 +4305,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				_tmp7_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp7_ < IMPORT_UI_REPORT_FAILURE_COUNT) {
-#line 4340 "Dialogs.c"
+#line 4305 "Dialogs.c"
 					gint _tmp8_ = 0;
 					GeeList* _tmp9_ = NULL;
 					gint _tmp10_ = 0;
@@ -4355,23 +4320,23 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp11_ = _tmp10_;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = _tmp8_ < _tmp11_;
-#line 4355 "Dialogs.c"
+#line 4320 "Dialogs.c"
 				} else {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = FALSE;
-#line 4359 "Dialogs.c"
+#line 4324 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4365 "Dialogs.c"
+#line 4330 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = show_dest_id;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4371 "Dialogs.c"
+#line 4336 "Dialogs.c"
 					GeeList* _tmp14_ = NULL;
 					gint _tmp15_ = 0;
 					gpointer _tmp16_ = NULL;
@@ -4391,7 +4356,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp18_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp17_);
-#line 4391 "Dialogs.c"
+#line 4356 "Dialogs.c"
 				} else {
 					GeeList* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
@@ -4412,7 +4377,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp23_;
 #line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp22_);
-#line 4412 "Dialogs.c"
+#line 4377 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = list;
@@ -4428,7 +4393,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				list = _tmp27_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp26_);
-#line 4428 "Dialogs.c"
+#line 4393 "Dialogs.c"
 			}
 		}
 	}
@@ -4444,7 +4409,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 	_tmp31_ = remaining;
 #line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp31_ > 0) {
-#line 4444 "Dialogs.c"
+#line 4409 "Dialogs.c"
 		const gchar* _tmp32_ = NULL;
 		const gchar* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
@@ -4469,13 +4434,13 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 		list = _tmp37_;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp36_);
-#line 4469 "Dialogs.c"
+#line 4434 "Dialogs.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = list;
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4475 "Dialogs.c"
+#line 4440 "Dialogs.c"
 }
 
 
@@ -4521,21 +4486,21 @@ ImportUIQuestionParams* import_ui_question_params_construct (GType object_type,
 	self->no_button = _tmp5_;
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 4521 "Dialogs.c"
+#line 4486 "Dialogs.c"
 }
 
 
 ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button) {
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return import_ui_question_params_construct (IMPORT_UI_TYPE_QUESTION_PARAMS, question, yes_button, no_button);
-#line 4528 "Dialogs.c"
+#line 4493 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_init (GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 4535 "Dialogs.c"
+#line 4500 "Dialogs.c"
 }
 
 
@@ -4544,7 +4509,7 @@ static void import_ui_value_question_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (value->data[0].v_pointer);
-#line 4544 "Dialogs.c"
+#line 4509 "Dialogs.c"
 	}
 }
 
@@ -4554,11 +4519,11 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = import_ui_question_params_ref (src_value->data[0].v_pointer);
-#line 4554 "Dialogs.c"
+#line 4519 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4558 "Dialogs.c"
+#line 4523 "Dialogs.c"
 	}
 }
 
@@ -4566,37 +4531,37 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 static gpointer import_ui_value_question_params_peek_pointer (const GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4566 "Dialogs.c"
+#line 4531 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 4573 "Dialogs.c"
+#line 4538 "Dialogs.c"
 		ImportUIQuestionParams* object;
 		object = collect_values[0].v_pointer;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4580 "Dialogs.c"
+#line 4545 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4584 "Dialogs.c"
+#line 4549 "Dialogs.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = import_ui_question_params_ref (object);
-#line 4588 "Dialogs.c"
+#line 4553 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4592 "Dialogs.c"
+#line 4557 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4596 "Dialogs.c"
+#line 4561 "Dialogs.c"
 }
 
 
@@ -4607,25 +4572,25 @@ static gchar* import_ui_value_question_params_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4607 "Dialogs.c"
+#line 4572 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 4613 "Dialogs.c"
+#line 4578 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4617 "Dialogs.c"
+#line 4582 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4621 "Dialogs.c"
+#line 4586 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4625 "Dialogs.c"
+#line 4590 "Dialogs.c"
 }
 
 
@@ -4639,7 +4604,7 @@ GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 4639 "Dialogs.c"
+#line 4604 "Dialogs.c"
 }
 
 
@@ -4648,7 +4613,7 @@ gpointer import_ui_value_get_question_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4648 "Dialogs.c"
+#line 4613 "Dialogs.c"
 }
 
 
@@ -4668,17 +4633,17 @@ void import_ui_value_set_question_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4668 "Dialogs.c"
+#line 4633 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4672 "Dialogs.c"
+#line 4637 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4678 "Dialogs.c"
+#line 4643 "Dialogs.c"
 	}
 }
 
@@ -4697,17 +4662,17 @@ void import_ui_value_take_question_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 4697 "Dialogs.c"
+#line 4662 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4701 "Dialogs.c"
+#line 4666 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4707 "Dialogs.c"
+#line 4672 "Dialogs.c"
 	}
 }
 
@@ -4717,14 +4682,14 @@ static void import_ui_question_params_class_init (ImportUIQuestionParamsClass *
 	import_ui_question_params_parent_class = g_type_class_peek_parent (klass);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((ImportUIQuestionParamsClass *) klass)->finalize = import_ui_question_params_finalize;
-#line 4717 "Dialogs.c"
+#line 4682 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_instance_init (ImportUIQuestionParams * self) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 4724 "Dialogs.c"
+#line 4689 "Dialogs.c"
 }
 
 
@@ -4740,7 +4705,7 @@ static void import_ui_question_params_finalize (ImportUIQuestionParams* obj) {
 	_g_free0 (self->yes_button);
 #line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 4740 "Dialogs.c"
+#line 4705 "Dialogs.c"
 }
 
 
@@ -4765,7 +4730,7 @@ gpointer import_ui_question_params_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 4765 "Dialogs.c"
+#line 4730 "Dialogs.c"
 }
 
 
@@ -4778,7 +4743,7 @@ void import_ui_question_params_unref (gpointer instance) {
 		IMPORT_UI_QUESTION_PARAMS_GET_CLASS (self)->finalize (self);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4778 "Dialogs.c"
+#line 4743 "Dialogs.c"
 	}
 }
 
@@ -4787,7 +4752,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4787 "Dialogs.c"
+#line 4752 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4800,7 +4765,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4800 "Dialogs.c"
+#line 4765 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4817,7 +4782,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4817 "Dialogs.c"
+#line 4782 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4831,7 +4796,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4831 "Dialogs.c"
+#line 4796 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				PhotoFileFormat _tmp11_ = 0;
@@ -4843,11 +4808,11 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_tmp11_ = photo_file_format_get_by_file_extension (_tmp10_);
 #line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 4843 "Dialogs.c"
+#line 4808 "Dialogs.c"
 			} else {
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4847 "Dialogs.c"
+#line 4812 "Dialogs.c"
 			}
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4859,21 +4824,21 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4859 "Dialogs.c"
+#line 4824 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4863 "Dialogs.c"
+#line 4828 "Dialogs.c"
 		}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4867 "Dialogs.c"
+#line 4832 "Dialogs.c"
 	}
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4873 "Dialogs.c"
+#line 4838 "Dialogs.c"
 }
 
 
@@ -4881,7 +4846,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4881 "Dialogs.c"
+#line 4846 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4894,7 +4859,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4894 "Dialogs.c"
+#line 4859 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4911,7 +4876,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4911 "Dialogs.c"
+#line 4876 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4925,7 +4890,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4925 "Dialogs.c"
+#line 4890 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
@@ -4937,11 +4902,11 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_tmp11_ = video_reader_is_supported_video_file (_tmp10_);
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_;
-#line 4937 "Dialogs.c"
+#line 4902 "Dialogs.c"
 			} else {
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4941 "Dialogs.c"
+#line 4906 "Dialogs.c"
 			}
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4953,21 +4918,21 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4953 "Dialogs.c"
+#line 4918 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4957 "Dialogs.c"
+#line 4922 "Dialogs.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4961 "Dialogs.c"
+#line 4926 "Dialogs.c"
 	}
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4967 "Dialogs.c"
+#line 4932 "Dialogs.c"
 }
 
 
@@ -5007,21 +4972,21 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 	_tmp5_ = has_photos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 5007 "Dialogs.c"
+#line 4972 "Dialogs.c"
 		gboolean _tmp6_ = FALSE;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = has_videos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp6_;
-#line 5013 "Dialogs.c"
+#line 4978 "Dialogs.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 5017 "Dialogs.c"
+#line 4982 "Dialogs.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 5021 "Dialogs.c"
+#line 4986 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5032,14 +4997,14 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 		result = _tmp8_;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 5032 "Dialogs.c"
+#line 4997 "Dialogs.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = has_photos;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 5039 "Dialogs.c"
+#line 5004 "Dialogs.c"
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5050,14 +5015,14 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 			result = _tmp11_;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 5050 "Dialogs.c"
+#line 5015 "Dialogs.c"
 		} else {
 			gboolean _tmp12_ = FALSE;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = has_videos;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp12_) {
-#line 5057 "Dialogs.c"
+#line 5022 "Dialogs.c"
 				const gchar* _tmp13_ = NULL;
 				gchar* _tmp14_ = NULL;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5068,7 +5033,7 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp14_;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5068 "Dialogs.c"
+#line 5033 "Dialogs.c"
 			} else {
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -5080,7 +5045,7 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp16_;
 #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5080 "Dialogs.c"
+#line 5045 "Dialogs.c"
 			}
 		}
 	}
@@ -5313,7 +5278,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp50_ = _tmp49_;
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp50_ > 0) {
-#line 5313 "Dialogs.c"
+#line 5278 "Dialogs.c"
 		GString* _tmp51_ = NULL;
 		const gchar* _tmp52_ = NULL;
 		gchar* _tmp53_ = NULL;
@@ -5330,7 +5295,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp51_, _tmp54_);
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp54_);
-#line 5330 "Dialogs.c"
+#line 5295 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp55_ = NULL;
@@ -5361,7 +5326,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5361 "Dialogs.c"
+#line 5326 "Dialogs.c"
 				gint _tmp61_ = 0;
 				gint _tmp62_ = 0;
 				gint _tmp63_ = 0;
@@ -5401,7 +5366,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp62_ < _tmp63_)) {
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5401 "Dialogs.c"
+#line 5366 "Dialogs.c"
 				}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _result_list;
@@ -5471,11 +5436,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp85_, _tmp86_);
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5471 "Dialogs.c"
+#line 5436 "Dialogs.c"
 			}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5475 "Dialogs.c"
+#line 5440 "Dialogs.c"
 		}
 	}
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5488,7 +5453,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp90_ = _tmp89_;
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp90_ > 0) {
-#line 5488 "Dialogs.c"
+#line 5453 "Dialogs.c"
 		GString* _tmp91_ = NULL;
 		const gchar* _tmp92_ = NULL;
 		gchar* _tmp93_ = NULL;
@@ -5505,7 +5470,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp91_, _tmp94_);
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp94_);
-#line 5505 "Dialogs.c"
+#line 5470 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp95_ = NULL;
@@ -5536,7 +5501,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5536 "Dialogs.c"
+#line 5501 "Dialogs.c"
 				gint _tmp101_ = 0;
 				gint _tmp102_ = 0;
 				gint _tmp103_ = 0;
@@ -5572,7 +5537,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp102_ < _tmp103_)) {
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5572 "Dialogs.c"
+#line 5537 "Dialogs.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp104_ = _result_list;
@@ -5630,11 +5595,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp121_, _tmp122_);
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5630 "Dialogs.c"
+#line 5595 "Dialogs.c"
 			}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5634 "Dialogs.c"
+#line 5599 "Dialogs.c"
 		}
 	}
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5647,7 +5612,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp126_ = _tmp125_;
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp126_ > 0) {
-#line 5647 "Dialogs.c"
+#line 5612 "Dialogs.c"
 		GString* _tmp127_ = NULL;
 		const gchar* _tmp128_ = NULL;
 		gchar* _tmp129_ = NULL;
@@ -5665,7 +5630,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp127_, _tmp130_);
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp130_);
-#line 5664 "Dialogs.c"
+#line 5629 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp131_ = NULL;
@@ -5696,7 +5661,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5695 "Dialogs.c"
+#line 5660 "Dialogs.c"
 				gint _tmp137_ = 0;
 				gint _tmp138_ = 0;
 				gint _tmp139_ = 0;
@@ -5732,7 +5697,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp138_ < _tmp139_)) {
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5731 "Dialogs.c"
+#line 5696 "Dialogs.c"
 				}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp140_ = _result_list;
@@ -5790,11 +5755,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp157_, _tmp158_);
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5789 "Dialogs.c"
+#line 5754 "Dialogs.c"
 			}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5793 "Dialogs.c"
+#line 5758 "Dialogs.c"
 		}
 	}
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5807,7 +5772,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp162_ = _tmp161_;
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp162_ > 0) {
-#line 5806 "Dialogs.c"
+#line 5771 "Dialogs.c"
 		GString* _tmp163_ = NULL;
 		const gchar* _tmp164_ = NULL;
 		gchar* _tmp165_ = NULL;
@@ -5825,7 +5790,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp163_, _tmp166_);
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp166_);
-#line 5823 "Dialogs.c"
+#line 5788 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp167_ = NULL;
@@ -5856,7 +5821,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5854 "Dialogs.c"
+#line 5819 "Dialogs.c"
 				gint _tmp173_ = 0;
 				gint _tmp174_ = 0;
 				gint _tmp175_ = 0;
@@ -5892,7 +5857,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp174_ < _tmp175_)) {
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5890 "Dialogs.c"
+#line 5855 "Dialogs.c"
 				}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp176_ = _result_list;
@@ -5950,11 +5915,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp193_, _tmp194_);
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5948 "Dialogs.c"
+#line 5913 "Dialogs.c"
 			}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5952 "Dialogs.c"
+#line 5917 "Dialogs.c"
 		}
 	}
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5967,7 +5932,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp198_ = _tmp197_;
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp198_ > 0) {
-#line 5965 "Dialogs.c"
+#line 5930 "Dialogs.c"
 		GString* _tmp199_ = NULL;
 		const gchar* _tmp200_ = NULL;
 		gchar* _tmp201_ = NULL;
@@ -5985,7 +5950,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp199_, _tmp202_);
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp202_);
-#line 5982 "Dialogs.c"
+#line 5947 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp203_ = NULL;
@@ -6016,7 +5981,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6013 "Dialogs.c"
+#line 5978 "Dialogs.c"
 				gint _tmp209_ = 0;
 				gint _tmp210_ = 0;
 				gint _tmp211_ = 0;
@@ -6057,7 +6022,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp210_ < _tmp211_)) {
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6054 "Dialogs.c"
+#line 6019 "Dialogs.c"
 				}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp212_ = _result_list;
@@ -6127,11 +6092,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp234_, _tmp235_);
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6124 "Dialogs.c"
+#line 6089 "Dialogs.c"
 			}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6128 "Dialogs.c"
+#line 6093 "Dialogs.c"
 		}
 	}
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6144,7 +6109,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp239_ = _tmp238_;
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp239_ > 0) {
-#line 6141 "Dialogs.c"
+#line 6106 "Dialogs.c"
 		GString* _tmp240_ = NULL;
 		const gchar* _tmp241_ = NULL;
 		gchar* _tmp242_ = NULL;
@@ -6161,7 +6126,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp240_, _tmp243_);
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp243_);
-#line 6158 "Dialogs.c"
+#line 6123 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp244_ = NULL;
@@ -6192,7 +6157,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6189 "Dialogs.c"
+#line 6154 "Dialogs.c"
 				gint _tmp250_ = 0;
 				gint _tmp251_ = 0;
 				gint _tmp252_ = 0;
@@ -6228,7 +6193,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp251_ < _tmp252_)) {
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6225 "Dialogs.c"
+#line 6190 "Dialogs.c"
 				}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp253_ = _result_list;
@@ -6286,11 +6251,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp270_, _tmp271_);
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6283 "Dialogs.c"
+#line 6248 "Dialogs.c"
 			}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6287 "Dialogs.c"
+#line 6252 "Dialogs.c"
 		}
 	}
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6303,7 +6268,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp275_ = _tmp274_;
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp275_ > 0) {
-#line 6300 "Dialogs.c"
+#line 6265 "Dialogs.c"
 		GString* _tmp276_ = NULL;
 		const gchar* _tmp277_ = NULL;
 		gchar* _tmp278_ = NULL;
@@ -6320,7 +6285,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp276_, _tmp279_);
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp279_);
-#line 6317 "Dialogs.c"
+#line 6282 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp280_ = NULL;
@@ -6351,7 +6316,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6348 "Dialogs.c"
+#line 6313 "Dialogs.c"
 				gint _tmp286_ = 0;
 				gint _tmp287_ = 0;
 				gint _tmp288_ = 0;
@@ -6387,7 +6352,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp287_ < _tmp288_)) {
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6384 "Dialogs.c"
+#line 6349 "Dialogs.c"
 				}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp289_ = _result_list;
@@ -6445,11 +6410,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp306_, _tmp307_);
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6442 "Dialogs.c"
+#line 6407 "Dialogs.c"
 			}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6446 "Dialogs.c"
+#line 6411 "Dialogs.c"
 		}
 	}
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6470,7 +6435,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_g_string_free0 (builder);
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 6467 "Dialogs.c"
+#line 6432 "Dialogs.c"
 }
 
 
@@ -6579,7 +6544,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp4_ = _tmp3_;
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ > 0) {
-#line 6576 "Dialogs.c"
+#line 6541 "Dialogs.c"
 		gchar* photos_message = NULL;
 		ImportManifest* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
@@ -6748,7 +6713,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6745 "Dialogs.c"
+#line 6710 "Dialogs.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = manifest;
@@ -6760,7 +6725,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp55_ = _tmp54_;
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp55_ > 0) {
-#line 6757 "Dialogs.c"
+#line 6722 "Dialogs.c"
 		const gchar* _tmp56_ = NULL;
 		gint _tmp57_ = 0;
 		gint _tmp58_ = 0;
@@ -6833,7 +6798,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp58_ = _tmp57_;
 #line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp58_ > 0) {
-#line 6830 "Dialogs.c"
+#line 6795 "Dialogs.c"
 			const gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6844,7 +6809,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp60_;
-#line 6841 "Dialogs.c"
+#line 6806 "Dialogs.c"
 		}
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = manifest;
@@ -6988,7 +6953,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6985 "Dialogs.c"
+#line 6950 "Dialogs.c"
 	}
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = manifest;
@@ -7000,7 +6965,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp121_ = _tmp120_;
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp121_ > 0) {
-#line 6997 "Dialogs.c"
+#line 6962 "Dialogs.c"
 		const gchar* _tmp122_ = NULL;
 		gint _tmp123_ = 0;
 		gint _tmp124_ = 0;
@@ -7073,7 +7038,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp124_ = _tmp123_;
 #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp124_ > 0) {
-#line 7070 "Dialogs.c"
+#line 7035 "Dialogs.c"
 			const gchar* _tmp125_ = NULL;
 			gchar* _tmp126_ = NULL;
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7084,7 +7049,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp126_;
-#line 7081 "Dialogs.c"
+#line 7046 "Dialogs.c"
 		}
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = manifest;
@@ -7236,7 +7201,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7225 "Dialogs.c"
+#line 7190 "Dialogs.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp184_ = manifest;
@@ -7248,7 +7213,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp187_ = _tmp186_;
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp187_ > 0) {
-#line 7237 "Dialogs.c"
+#line 7202 "Dialogs.c"
 		const gchar* _tmp188_ = NULL;
 		gint _tmp189_ = 0;
 		gint _tmp190_ = 0;
@@ -7321,7 +7286,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp190_ = _tmp189_;
 #line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp190_ > 0) {
-#line 7310 "Dialogs.c"
+#line 7275 "Dialogs.c"
 			const gchar* _tmp191_ = NULL;
 			gchar* _tmp192_ = NULL;
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7332,7 +7297,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp192_;
-#line 7321 "Dialogs.c"
+#line 7286 "Dialogs.c"
 		}
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp193_ = manifest;
@@ -7476,7 +7441,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7465 "Dialogs.c"
+#line 7430 "Dialogs.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp250_ = manifest;
@@ -7488,7 +7453,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp253_ = _tmp252_;
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp253_ > 0) {
-#line 7477 "Dialogs.c"
+#line 7442 "Dialogs.c"
 		const gchar* _tmp254_ = NULL;
 		gint _tmp255_ = 0;
 		gint _tmp256_ = 0;
@@ -7561,7 +7526,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp256_ = _tmp255_;
 #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp256_ > 0) {
-#line 7550 "Dialogs.c"
+#line 7515 "Dialogs.c"
 			const gchar* _tmp257_ = NULL;
 			gchar* _tmp258_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7572,7 +7537,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp258_;
-#line 7561 "Dialogs.c"
+#line 7526 "Dialogs.c"
 		}
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp259_ = manifest;
@@ -7716,7 +7681,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7705 "Dialogs.c"
+#line 7670 "Dialogs.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp316_ = manifest;
@@ -7728,7 +7693,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp319_ = _tmp318_;
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp319_ > 0) {
-#line 7717 "Dialogs.c"
+#line 7682 "Dialogs.c"
 		const gchar* _tmp320_ = NULL;
 		gint _tmp321_ = 0;
 		gint _tmp322_ = 0;
@@ -7761,7 +7726,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp322_ = _tmp321_;
 #line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp322_ > 0) {
-#line 7750 "Dialogs.c"
+#line 7715 "Dialogs.c"
 			const gchar* _tmp323_ = NULL;
 			gchar* _tmp324_ = NULL;
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7772,7 +7737,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp324_;
-#line 7761 "Dialogs.c"
+#line 7726 "Dialogs.c"
 		}
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp325_ = manifest;
@@ -7828,7 +7793,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (_tmp343_);
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_photos_message);
-#line 7817 "Dialogs.c"
+#line 7782 "Dialogs.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp345_ = manifest;
@@ -7840,7 +7805,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp348_ = _tmp347_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp348_ > 0) {
-#line 7829 "Dialogs.c"
+#line 7794 "Dialogs.c"
 		const gchar* _tmp349_ = NULL;
 		gint _tmp350_ = 0;
 		gint _tmp351_ = 0;
@@ -7866,7 +7831,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp351_ = _tmp350_;
 #line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp351_ > 0) {
-#line 7855 "Dialogs.c"
+#line 7820 "Dialogs.c"
 			const gchar* _tmp352_ = NULL;
 			gchar* _tmp353_ = NULL;
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7877,7 +7842,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp353_;
-#line 7866 "Dialogs.c"
+#line 7831 "Dialogs.c"
 		}
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp354_ = manifest;
@@ -7913,7 +7878,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		message = _tmp366_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_files_message);
-#line 7902 "Dialogs.c"
+#line 7867 "Dialogs.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp367_ = manifest;
@@ -7925,7 +7890,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp370_ = _tmp369_;
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp370_ > 0) {
-#line 7914 "Dialogs.c"
+#line 7879 "Dialogs.c"
 		const gchar* _tmp371_ = NULL;
 		gint _tmp372_ = 0;
 		gint _tmp373_ = 0;
@@ -7998,7 +7963,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp373_ = _tmp372_;
 #line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp373_ > 0) {
-#line 7987 "Dialogs.c"
+#line 7952 "Dialogs.c"
 			const gchar* _tmp374_ = NULL;
 			gchar* _tmp375_ = NULL;
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8009,7 +7974,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp375_;
-#line 7998 "Dialogs.c"
+#line 7963 "Dialogs.c"
 		}
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp376_ = manifest;
@@ -8153,7 +8118,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8142 "Dialogs.c"
+#line 8107 "Dialogs.c"
 	}
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp433_ = manifest;
@@ -8165,7 +8130,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp436_ = _tmp435_;
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp436_ > 0) {
-#line 8154 "Dialogs.c"
+#line 8119 "Dialogs.c"
 		const gchar* _tmp437_ = NULL;
 		gint _tmp438_ = 0;
 		gint _tmp439_ = 0;
@@ -8219,7 +8184,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp439_ = _tmp438_;
 #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp439_ > 0) {
-#line 8208 "Dialogs.c"
+#line 8173 "Dialogs.c"
 			const gchar* _tmp440_ = NULL;
 			gchar* _tmp441_ = NULL;
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8230,7 +8195,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp441_;
-#line 8219 "Dialogs.c"
+#line 8184 "Dialogs.c"
 		}
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp442_ = manifest;
@@ -8328,7 +8293,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8317 "Dialogs.c"
+#line 8282 "Dialogs.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp481_ = manifest;
@@ -8420,7 +8385,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp522_ = total;
 #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp522_ == 0) {
-#line 8409 "Dialogs.c"
+#line 8374 "Dialogs.c"
 		const gchar* _tmp523_ = NULL;
 		const gchar* _tmp524_ = NULL;
 		gchar* _tmp525_ = NULL;
@@ -8434,7 +8399,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (message);
 #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp525_;
-#line 8423 "Dialogs.c"
+#line 8388 "Dialogs.c"
 	}
 #line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = NULL;
@@ -8444,7 +8409,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp526_ = question;
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp526_ == NULL) {
-#line 8433 "Dialogs.c"
+#line 8398 "Dialogs.c"
 		AppWindow* _tmp527_ = NULL;
 		AppWindow* _tmp528_ = NULL;
 		const gchar* _tmp529_ = NULL;
@@ -8564,7 +8529,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp556_ = dialog_response;
 #line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp556_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) {
-#line 8553 "Dialogs.c"
+#line 8518 "Dialogs.c"
 			GtkWindow* _tmp557_ = NULL;
 			ImportManifest* _tmp558_ = NULL;
 			gchar* _tmp559_ = NULL;
@@ -8581,7 +8546,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			import_ui_save_import_results (_tmp557_, _tmp560_);
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp560_);
-#line 8570 "Dialogs.c"
+#line 8535 "Dialogs.c"
 		}
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog_parent);
@@ -8589,7 +8554,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_object_unref0 (ok_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8578 "Dialogs.c"
+#line 8543 "Dialogs.c"
 	} else {
 		const gchar* _tmp561_ = NULL;
 		ImportUIQuestionParams* _tmp562_ = NULL;
@@ -8733,7 +8698,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		dialog_response = _tmp596_;
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 8722 "Dialogs.c"
+#line 8687 "Dialogs.c"
 			gint _tmp597_ = 0;
 			GtkMessageDialog* _tmp598_ = NULL;
 			ImportManifest* _tmp599_ = NULL;
@@ -8747,7 +8712,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			if (!(_tmp597_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) {
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 8736 "Dialogs.c"
+#line 8701 "Dialogs.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp598_ = dialog;
@@ -8767,7 +8732,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_tmp603_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp602_, gtk_dialog_get_type (), GtkDialog));
 #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dialog_response = _tmp603_;
-#line 8756 "Dialogs.c"
+#line 8721 "Dialogs.c"
 		}
 #line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp604_ = dialog;
@@ -8781,7 +8746,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_object_unref0 (no_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8770 "Dialogs.c"
+#line 8735 "Dialogs.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp606_ = dialog_response;
@@ -8793,7 +8758,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_g_free0 (message);
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8782 "Dialogs.c"
+#line 8747 "Dialogs.c"
 }
 
 
@@ -8809,41 +8774,41 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 8826 "Dialogs.c"
+#line 8791 "Dialogs.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 8832 "Dialogs.c"
+#line 8797 "Dialogs.c"
 }
 
 
@@ -8921,21 +8886,21 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 	_tmp14_ = dialog_result;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 8910 "Dialogs.c"
+#line 8875 "Dialogs.c"
 		GFile* _tmp15_ = NULL;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = chosen_file;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_ != NULL;
-#line 8916 "Dialogs.c"
+#line 8881 "Dialogs.c"
 	} else {
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 8920 "Dialogs.c"
+#line 8885 "Dialogs.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_) {
-#line 8924 "Dialogs.c"
+#line 8889 "Dialogs.c"
 		{
 			GFileOutputStream* outstream = NULL;
 			GFile* _tmp16_ = NULL;
@@ -8955,7 +8920,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			outstream = _tmp17_;
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8944 "Dialogs.c"
+#line 8909 "Dialogs.c"
 				goto __catch421_g_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8969,28 +8934,28 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21__length1 = _tmp20__length1;
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, g_output_stream_get_type (), GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
+			g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OUTPUT_STREAM, GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8963 "Dialogs.c"
+#line 8928 "Dialogs.c"
 				goto __catch421_g_error;
 			}
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
+			g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8974 "Dialogs.c"
+#line 8939 "Dialogs.c"
 				goto __catch421_g_error;
 			}
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
-#line 8979 "Dialogs.c"
+#line 8944 "Dialogs.c"
 		}
 		goto __finally421;
 		__catch421_g_error:
@@ -9021,7 +8986,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			_g_free0 (_tmp25_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_error_free0 (err);
-#line 9010 "Dialogs.c"
+#line 8975 "Dialogs.c"
 		}
 		__finally421:
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9036,14 +9001,14 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			g_clear_error (&_inner_error_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return;
-#line 9025 "Dialogs.c"
+#line 8990 "Dialogs.c"
 		}
 	}
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chosen_file);
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser_dialog);
-#line 9032 "Dialogs.c"
+#line 8997 "Dialogs.c"
 }
 
 
@@ -9052,7 +9017,7 @@ static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog
 	result = text_entry_dialog_mediator_on_modify_validate ((TextEntryDialogMediator*) self, text);
 #line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9041 "Dialogs.c"
+#line 9006 "Dialogs.c"
 }
 
 
@@ -9121,7 +9086,7 @@ TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type
 	_g_object_unref0 (builder);
 #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9110 "Dialogs.c"
+#line 9075 "Dialogs.c"
 }
 
 
@@ -9133,7 +9098,7 @@ static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDia
 	result = TRUE;
 #line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9122 "Dialogs.c"
+#line 9087 "Dialogs.c"
 }
 
 
@@ -9142,7 +9107,7 @@ gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator*
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9131 "Dialogs.c"
+#line 9096 "Dialogs.c"
 }
 
 
@@ -9160,14 +9125,14 @@ gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) {
 	result = _tmp1_;
 #line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9149 "Dialogs.c"
+#line 9114 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_init (GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9156 "Dialogs.c"
+#line 9121 "Dialogs.c"
 }
 
 
@@ -9176,7 +9141,7 @@ static void value_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9165 "Dialogs.c"
+#line 9130 "Dialogs.c"
 	}
 }
 
@@ -9186,11 +9151,11 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9175 "Dialogs.c"
+#line 9140 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9179 "Dialogs.c"
+#line 9144 "Dialogs.c"
 	}
 }
 
@@ -9198,37 +9163,37 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 static gpointer value_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9187 "Dialogs.c"
+#line 9152 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9194 "Dialogs.c"
+#line 9159 "Dialogs.c"
 		TextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9201 "Dialogs.c"
+#line 9166 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9205 "Dialogs.c"
+#line 9170 "Dialogs.c"
 		}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = text_entry_dialog_mediator_ref (object);
-#line 9209 "Dialogs.c"
+#line 9174 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9213 "Dialogs.c"
+#line 9178 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9217 "Dialogs.c"
+#line 9182 "Dialogs.c"
 }
 
 
@@ -9239,25 +9204,25 @@ static gchar* value_text_entry_dialog_mediator_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9228 "Dialogs.c"
+#line 9193 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9234 "Dialogs.c"
+#line 9199 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9238 "Dialogs.c"
+#line 9203 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9242 "Dialogs.c"
+#line 9207 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9246 "Dialogs.c"
+#line 9211 "Dialogs.c"
 }
 
 
@@ -9271,7 +9236,7 @@ GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9260 "Dialogs.c"
+#line 9225 "Dialogs.c"
 }
 
 
@@ -9280,7 +9245,7 @@ gpointer value_get_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9269 "Dialogs.c"
+#line 9234 "Dialogs.c"
 }
 
 
@@ -9300,17 +9265,17 @@ void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9289 "Dialogs.c"
+#line 9254 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9293 "Dialogs.c"
+#line 9258 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9299 "Dialogs.c"
+#line 9264 "Dialogs.c"
 	}
 }
 
@@ -9329,17 +9294,17 @@ void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9318 "Dialogs.c"
+#line 9283 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9322 "Dialogs.c"
+#line 9287 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9328 "Dialogs.c"
+#line 9293 "Dialogs.c"
 	}
 }
 
@@ -9353,7 +9318,7 @@ static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass
 	g_type_class_add_private (klass, sizeof (TextEntryDialogMediatorPrivate));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = text_entry_dialog_mediator_real_on_modify_validate;
-#line 9342 "Dialogs.c"
+#line 9307 "Dialogs.c"
 }
 
 
@@ -9362,7 +9327,7 @@ static void text_entry_dialog_mediator_instance_init (TextEntryDialogMediator *
 	self->priv = TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9351 "Dialogs.c"
+#line 9316 "Dialogs.c"
 }
 
 
@@ -9374,7 +9339,7 @@ static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator* obj) {
 	g_signal_handlers_destroy (self);
 #line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9363 "Dialogs.c"
+#line 9328 "Dialogs.c"
 }
 
 
@@ -9399,7 +9364,7 @@ gpointer text_entry_dialog_mediator_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9388 "Dialogs.c"
+#line 9353 "Dialogs.c"
 }
 
 
@@ -9412,7 +9377,7 @@ void text_entry_dialog_mediator_unref (gpointer instance) {
 		TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9401 "Dialogs.c"
+#line 9366 "Dialogs.c"
 	}
 }
 
@@ -9422,7 +9387,7 @@ static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_
 	result = multi_text_entry_dialog_mediator_on_modify_validate ((MultiTextEntryDialogMediator*) self, text);
 #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9411 "Dialogs.c"
+#line 9376 "Dialogs.c"
 }
 
 
@@ -9483,7 +9448,7 @@ MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType
 	_g_object_unref0 (builder);
 #line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9472 "Dialogs.c"
+#line 9437 "Dialogs.c"
 }
 
 
@@ -9495,7 +9460,7 @@ static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiT
 	result = TRUE;
 #line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9484 "Dialogs.c"
+#line 9449 "Dialogs.c"
 }
 
 
@@ -9504,7 +9469,7 @@ gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDial
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9493 "Dialogs.c"
+#line 9458 "Dialogs.c"
 }
 
 
@@ -9522,14 +9487,14 @@ gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator*
 	result = _tmp1_;
 #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9511 "Dialogs.c"
+#line 9476 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_init (GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9518 "Dialogs.c"
+#line 9483 "Dialogs.c"
 }
 
 
@@ -9538,7 +9503,7 @@ static void value_multi_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9527 "Dialogs.c"
+#line 9492 "Dialogs.c"
 	}
 }
 
@@ -9548,11 +9513,11 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 	if (src_value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9537 "Dialogs.c"
+#line 9502 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9541 "Dialogs.c"
+#line 9506 "Dialogs.c"
 	}
 }
 
@@ -9560,37 +9525,37 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 static gpointer value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9549 "Dialogs.c"
+#line 9514 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9556 "Dialogs.c"
+#line 9521 "Dialogs.c"
 		MultiTextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9563 "Dialogs.c"
+#line 9528 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9567 "Dialogs.c"
+#line 9532 "Dialogs.c"
 		}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (object);
-#line 9571 "Dialogs.c"
+#line 9536 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9575 "Dialogs.c"
+#line 9540 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9579 "Dialogs.c"
+#line 9544 "Dialogs.c"
 }
 
 
@@ -9601,25 +9566,25 @@ static gchar* value_multi_text_entry_dialog_mediator_lcopy_value (const GValue*
 	if (!object_p) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9590 "Dialogs.c"
+#line 9555 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9596 "Dialogs.c"
+#line 9561 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9600 "Dialogs.c"
+#line 9565 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9604 "Dialogs.c"
+#line 9569 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9608 "Dialogs.c"
+#line 9573 "Dialogs.c"
 }
 
 
@@ -9633,7 +9598,7 @@ GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9622 "Dialogs.c"
+#line 9587 "Dialogs.c"
 }
 
 
@@ -9642,7 +9607,7 @@ gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9631 "Dialogs.c"
+#line 9596 "Dialogs.c"
 }
 
 
@@ -9662,17 +9627,17 @@ void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_objec
 		value->data[0].v_pointer = v_object;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9651 "Dialogs.c"
+#line 9616 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9655 "Dialogs.c"
+#line 9620 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9661 "Dialogs.c"
+#line 9626 "Dialogs.c"
 	}
 }
 
@@ -9691,17 +9656,17 @@ void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_obje
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9680 "Dialogs.c"
+#line 9645 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9684 "Dialogs.c"
+#line 9649 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9690 "Dialogs.c"
+#line 9655 "Dialogs.c"
 	}
 }
 
@@ -9715,7 +9680,7 @@ static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMed
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogMediatorPrivate));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = multi_text_entry_dialog_mediator_real_on_modify_validate;
-#line 9704 "Dialogs.c"
+#line 9669 "Dialogs.c"
 }
 
 
@@ -9724,7 +9689,7 @@ static void multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialog
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9713 "Dialogs.c"
+#line 9678 "Dialogs.c"
 }
 
 
@@ -9736,7 +9701,7 @@ static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMedia
 	g_signal_handlers_destroy (self);
 #line 959 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9725 "Dialogs.c"
+#line 9690 "Dialogs.c"
 }
 
 
@@ -9761,7 +9726,7 @@ gpointer multi_text_entry_dialog_mediator_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9750 "Dialogs.c"
+#line 9715 "Dialogs.c"
 }
 
 
@@ -9774,7 +9739,7 @@ void multi_text_entry_dialog_mediator_unref (gpointer instance) {
 		MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9763 "Dialogs.c"
+#line 9728 "Dialogs.c"
 	}
 }
 
@@ -9792,7 +9757,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	_tmp0_ = should_escape;
 #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 9781 "Dialogs.c"
+#line 9746 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -9825,7 +9790,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 		result = _tmp8_;
 #line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 9814 "Dialogs.c"
+#line 9779 "Dialogs.c"
 	}
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = primary_text;
@@ -9845,7 +9810,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	result = _tmp14_;
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9834 "Dialogs.c"
+#line 9799 "Dialogs.c"
 }
 
 
@@ -9854,7 +9819,7 @@ static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_fu
 	result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
 #line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9843 "Dialogs.c"
+#line 9808 "Dialogs.c"
 }
 
 
@@ -9877,7 +9842,7 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	if (_tmp1_ == NULL) {
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 9866 "Dialogs.c"
+#line 9831 "Dialogs.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -9890,7 +9855,7 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 		_tmp4_ = _tmp3_;
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == 1;
-#line 9879 "Dialogs.c"
+#line 9844 "Dialogs.c"
 	}
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
@@ -9918,14 +9883,14 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9907 "Dialogs.c"
+#line 9872 "Dialogs.c"
 }
 
 
 EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
-#line 9914 "Dialogs.c"
+#line 9879 "Dialogs.c"
 }
 
 
@@ -9951,7 +9916,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	completion_iter = _tmp2_;
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	while (TRUE) {
-#line 9940 "Dialogs.c"
+#line 9905 "Dialogs.c"
 		GeeIterator* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 		GtkListStore* _tmp5_ = NULL;
@@ -9969,7 +9934,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		if (!_tmp4_) {
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			break;
-#line 9958 "Dialogs.c"
+#line 9923 "Dialogs.c"
 		}
 #line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = completion_store;
@@ -9991,7 +9956,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
 #line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp11_);
-#line 9980 "Dialogs.c"
+#line 9945 "Dialogs.c"
 	}
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = completion_store;
@@ -9999,7 +9964,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	_g_object_unref0 (completion_iter);
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9988 "Dialogs.c"
+#line 9953 "Dialogs.c"
 }
 
 
@@ -10008,21 +9973,21 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 10011 "Dialogs.c"
+#line 9976 "Dialogs.c"
 }
 
 
@@ -10030,19 +9995,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 10031 "Dialogs.c"
+#line 9996 "Dialogs.c"
 }
 
 
@@ -10053,35 +10018,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 10056 "Dialogs.c"
+#line 10021 "Dialogs.c"
 		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10064 "Dialogs.c"
+#line 10029 "Dialogs.c"
 	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10070 "Dialogs.c"
+#line 10035 "Dialogs.c"
 	}
 }
 
@@ -10149,7 +10114,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_tmp11_ = self->priv->delimiter;
 #line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == NULL) {
-#line 10138 "Dialogs.c"
+#line 10103 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -10180,7 +10145,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10169 "Dialogs.c"
+#line 10134 "Dialogs.c"
 	} else {
 		const gchar* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
@@ -10209,7 +10174,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_tmp20_ = string_contains (_tmp18_, _tmp19_);
 #line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp20_) {
-#line 10198 "Dialogs.c"
+#line 10163 "Dialogs.c"
 			gint offset = 0;
 			const gchar* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
@@ -10258,7 +10223,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 				_g_object_unref0 (model);
 #line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 10247 "Dialogs.c"
+#line 10212 "Dialogs.c"
 			}
 		}
 #line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10297,7 +10262,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 			_g_object_unref0 (model);
 #line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 10286 "Dialogs.c"
+#line 10251 "Dialogs.c"
 		}
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = possible_match;
@@ -10325,7 +10290,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10314 "Dialogs.c"
+#line 10279 "Dialogs.c"
 	}
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (normed_key);
@@ -10333,7 +10298,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_g_free0 (possible_match);
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (model);
-#line 10322 "Dialogs.c"
+#line 10287 "Dialogs.c"
 }
 
 
@@ -10344,39 +10309,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 10345 "Dialogs.c"
+#line 10310 "Dialogs.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10353 "Dialogs.c"
+#line 10318 "Dialogs.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10365 "Dialogs.c"
+#line 10330 "Dialogs.c"
 	}
 }
 
@@ -10394,114 +10359,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 10389 "Dialogs.c"
+#line 10354 "Dialogs.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 10395 "Dialogs.c"
+#line 10360 "Dialogs.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 10399 "Dialogs.c"
+#line 10364 "Dialogs.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 10403 "Dialogs.c"
+#line 10368 "Dialogs.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 10415 "Dialogs.c"
+#line 10380 "Dialogs.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 10425 "Dialogs.c"
+#line 10390 "Dialogs.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 10431 "Dialogs.c"
+#line 10396 "Dialogs.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 10445 "Dialogs.c"
+#line 10410 "Dialogs.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 10455 "Dialogs.c"
+#line 10420 "Dialogs.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 10461 "Dialogs.c"
+#line 10426 "Dialogs.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 10470 "Dialogs.c"
+#line 10435 "Dialogs.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 10490 "Dialogs.c"
+#line 10455 "Dialogs.c"
 }
 
 
@@ -10571,7 +10536,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_tmp9_ = _tmp8_;
 #line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ > 0) {
-#line 10560 "Dialogs.c"
+#line 10525 "Dialogs.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
@@ -10583,7 +10548,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 		_tmp12_ = string_contains (_tmp10_, _tmp11_);
 #line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp12_) {
-#line 10572 "Dialogs.c"
+#line 10537 "Dialogs.c"
 			const gchar* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			const gchar* _tmp15_ = NULL;
@@ -10600,11 +10565,11 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			if (g_strcmp0 (_tmp14_, " ") != 0) {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = " ";
-#line 10589 "Dialogs.c"
+#line 10554 "Dialogs.c"
 			} else {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = "";
-#line 10593 "Dialogs.c"
+#line 10558 "Dialogs.c"
 			}
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = old_text;
@@ -10628,7 +10593,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			old_text = _tmp22_;
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp21_);
-#line 10617 "Dialogs.c"
+#line 10582 "Dialogs.c"
 		} else {
 			gchar* _tmp23_ = NULL;
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10637,7 +10602,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			_g_free0 (old_text);
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			old_text = _tmp23_;
-#line 10626 "Dialogs.c"
+#line 10591 "Dialogs.c"
 		}
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10646,11 +10611,11 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	if (g_strcmp0 (_tmp25_, " ") != 0) {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = " ";
-#line 10635 "Dialogs.c"
+#line 10600 "Dialogs.c"
 	} else {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = "";
-#line 10639 "Dialogs.c"
+#line 10604 "Dialogs.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = old_text;
@@ -10700,7 +10665,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_g_free0 (match);
 #line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10689 "Dialogs.c"
+#line 10654 "Dialogs.c"
 }
 
 
@@ -10738,7 +10703,7 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 	_tmp5__length1 = split_length1;
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 10727 "Dialogs.c"
+#line 10692 "Dialogs.c"
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		const gchar* _tmp7_ = NULL;
@@ -10750,15 +10715,15 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		_tmp7_ = _tmp6_[0];
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp7_ != NULL;
-#line 10739 "Dialogs.c"
+#line 10704 "Dialogs.c"
 	} else {
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 10743 "Dialogs.c"
+#line 10708 "Dialogs.c"
 	}
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 10747 "Dialogs.c"
+#line 10712 "Dialogs.c"
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
 		gchar** _tmp9_ = NULL;
@@ -10783,7 +10748,7 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10772 "Dialogs.c"
+#line 10737 "Dialogs.c"
 	} else {
 		gchar* _tmp12_ = NULL;
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10794,11 +10759,11 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10783 "Dialogs.c"
+#line 10748 "Dialogs.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 10787 "Dialogs.c"
+#line 10752 "Dialogs.c"
 }
 
 
@@ -10811,14 +10776,14 @@ static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass
 	((GtkEntryCompletionClass *) klass)->match_selected = entry_multi_completion_real_match_selected;
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize;
-#line 10800 "Dialogs.c"
+#line 10765 "Dialogs.c"
 }
 
 
 static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
-#line 10807 "Dialogs.c"
+#line 10772 "Dialogs.c"
 }
 
 
@@ -10830,7 +10795,7 @@ static void entry_multi_completion_finalize (GObject* obj) {
 	_g_free0 (self->priv->delimiter);
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
-#line 10819 "Dialogs.c"
+#line 10784 "Dialogs.c"
 }
 
 
@@ -10846,515 +10811,95 @@ GType entry_multi_completion_get_type (void) {
 }
 
 
-static void _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_dialog_on_checkbox_clicked ((SetBackgroundDialog*) self);
-#line 10838 "Dialogs.c"
-}
-
-
-SetBackgroundDialog* set_background_dialog_construct (GType object_type, GtkBuilder* builder) {
-	SetBackgroundDialog* self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkDialog* _tmp2_ = NULL;
-	GtkDialog* _tmp3_ = NULL;
-	GtkDialog* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	AppWindow* _tmp6_ = NULL;
-	GdkWindow* _tmp7_ = NULL;
-	GtkDialog* _tmp8_ = NULL;
-	AppWindow* _tmp9_ = NULL;
-	AppWindow* _tmp10_ = NULL;
-	GtkDialog* _tmp11_ = NULL;
-	GtkBuilder* _tmp12_ = NULL;
-	GObject* _tmp13_ = NULL;
-	GtkCheckButton* _tmp14_ = NULL;
-	GtkCheckButton* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	GtkCheckButton* _tmp17_ = NULL;
-	GtkBuilder* _tmp18_ = NULL;
-	GObject* _tmp19_ = NULL;
-	GtkCheckButton* _tmp20_ = NULL;
-	GtkCheckButton* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	GtkCheckButton* _tmp23_ = NULL;
-	GtkBuilder* _tmp24_ = NULL;
-	GObject* _tmp25_ = NULL;
-	GtkButton* _tmp26_ = NULL;
+SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
+	SetBackgroundPhotoDialog * self = NULL;
+	gboolean use_header = FALSE;
+	GtkSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gboolean _tmp2_ = FALSE;
+	AppWindow* _tmp3_ = NULL;
+	AppWindow* _tmp4_ = NULL;
 #line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
+	_tmp0_ = gtk_settings_get_default ();
 #line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundDialog*) g_type_create_instance (object_type);
-#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = builder;
+	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = use_header;
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp2_) {
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 1;
+#line 10818 "Dialogs.c"
+	} else {
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 0;
+#line 10822 "Dialogs.c"
+	}
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "dialog1");
+	_tmp3_ = app_window_get_instance ();
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp1_) : NULL);
+	_tmp4_ = _tmp3_;
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->dialog);
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->dialog = _tmp2_;
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->dialog;
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = self->dialog;
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = app_window_get_instance ();
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _tmp5_;
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp7_);
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp6_);
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = self->dialog;
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = app_window_get_instance ();
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow));
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp10_);
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->dialog;
+	_g_object_unref0 (_tmp4_);
+#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	return self;
+#line 10836 "Dialogs.c"
+}
+
+
+SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
+#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
+#line 10843 "Dialogs.c"
+}
+
+
+static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkCheckButton* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
 #line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (_tmp11_, (gint) GTK_RESPONSE_OK);
+	g_return_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self));
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = builder;
+	_tmp1_ = self->priv->desktop_background_checkbox;
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = gtk_builder_get_object (_tmp12_, "desktop_background_checkbox");
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp13_) : NULL);
+	_tmp3_ = _tmp2_;
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->desktop_background_button);
+	if (_tmp3_) {
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->desktop_background_button = _tmp14_;
+		_tmp0_ = TRUE;
+#line 10864 "Dialogs.c"
+	} else {
+		GtkCheckButton* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = self->desktop_background_button;
+		_tmp4_ = self->priv->screensaver_checkbox;
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->desktop;
+		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp16_);
-#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->desktop_background_button;
-#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled, self);
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = builder;
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "screensaver_checkbox");
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp19_) : NULL);
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->screensaver_button);
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->screensaver_button = _tmp20_;
-#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = self->screensaver_button;
-#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = self->screensaver;
-#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp22_);
-#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = self->screensaver_button;
-#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled, self);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = builder;
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = gtk_builder_get_object (_tmp24_, "ok_button");
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->ok_button);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->ok_button = _tmp26_;
-#line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 10967 "Dialogs.c"
-}
-
-
-void set_background_dialog_on_checkbox_clicked (SetBackgroundDialog* self) {
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	GtkCheckButton* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_SET_BACKGROUND_DIALOG (self));
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->desktop_background_button;
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_;
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->desktop = _tmp2_;
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->screensaver_button;
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->screensaver = _tmp5_;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = self->desktop;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp7_) {
-#line 11002 "Dialogs.c"
-		gboolean _tmp8_ = FALSE;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = self->screensaver;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = !_tmp8_;
-#line 11008 "Dialogs.c"
-	} else {
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = FALSE;
-#line 11012 "Dialogs.c"
-	}
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp6_) {
-#line 11016 "Dialogs.c"
-		GtkButton* _tmp9_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->ok_button;
-#line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 11022 "Dialogs.c"
-	} else {
-		GtkButton* _tmp10_ = NULL;
-#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->ok_button;
-#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 11029 "Dialogs.c"
-	}
-}
-
-
-gboolean set_background_dialog_execute_base (SetBackgroundDialog* self) {
-	gboolean result = FALSE;
-	GtkDialog* _tmp0_ = NULL;
-	gboolean _result_ = FALSE;
-	GtkDialog* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	GtkDialog* _tmp3_ = NULL;
-#line 1121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_SET_BACKGROUND_DIALOG (self), FALSE);
-#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->dialog;
-#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->dialog;
-#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_dialog_run (_tmp1_);
-#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp2_ == ((gint) GTK_RESPONSE_OK);
-#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->dialog;
-#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _result_;
-#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 11061 "Dialogs.c"
-}
-
-
-static void value_set_background_dialog_init (GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	value->data[0].v_pointer = NULL;
-#line 11068 "Dialogs.c"
-}
-
-
-static void value_set_background_dialog_free_value (GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (value->data[0].v_pointer) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_unref (value->data[0].v_pointer);
-#line 11077 "Dialogs.c"
-	}
-}
-
-
-static void value_set_background_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (src_value->data[0].v_pointer) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = set_background_dialog_ref (src_value->data[0].v_pointer);
-#line 11087 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 11091 "Dialogs.c"
-	}
-}
-
-
-static gpointer value_set_background_dialog_peek_pointer (const GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 11099 "Dialogs.c"
-}
-
-
-static gchar* value_set_background_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (collect_values[0].v_pointer) {
-#line 11106 "Dialogs.c"
-		SetBackgroundDialog* object;
-		object = collect_values[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11113 "Dialogs.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11117 "Dialogs.c"
-		}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = set_background_dialog_ref (object);
-#line 11121 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 11125 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 11129 "Dialogs.c"
-}
-
-
-static gchar* value_set_background_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SetBackgroundDialog** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!object_p) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11140 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!value->data[0].v_pointer) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = NULL;
-#line 11146 "Dialogs.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = value->data[0].v_pointer;
-#line 11150 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = set_background_dialog_ref (value->data[0].v_pointer);
-#line 11154 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 11158 "Dialogs.c"
-}
-
-
-GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecSetBackgroundDialog* spec;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SET_BACKGROUND_DIALOG), NULL);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return G_PARAM_SPEC (spec);
-#line 11172 "Dialogs.c"
-}
-
-
-gpointer value_get_set_background_dialog (const GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG), NULL);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 11181 "Dialogs.c"
-}
-
-
-void value_set_set_background_dialog (GValue* value, gpointer v_object) {
-	SetBackgroundDialog* old;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_ref (value->data[0].v_pointer);
-#line 11201 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 11205 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_unref (old);
-#line 11211 "Dialogs.c"
-	}
-}
-
-
-void value_take_set_background_dialog (GValue* value, gpointer v_object) {
-	SetBackgroundDialog* old;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 11230 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 11234 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_unref (old);
-#line 11240 "Dialogs.c"
+		_tmp6_ = _tmp5_;
+#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp0_ = _tmp6_;
+#line 10877 "Dialogs.c"
 	}
+#line 1099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
+#line 10881 "Dialogs.c"
 }
 
 
-static void set_background_dialog_class_init (SetBackgroundDialogClass * klass) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((SetBackgroundDialogClass *) klass)->finalize = set_background_dialog_finalize;
-#line 11250 "Dialogs.c"
-}
-
-
-static void set_background_dialog_instance_init (SetBackgroundDialog * self) {
-#line 1089 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->desktop = TRUE;
-#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->screensaver = FALSE;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->ref_count = 1;
-#line 11261 "Dialogs.c"
-}
-
-
-static void set_background_dialog_finalize (SetBackgroundDialog* obj) {
-	SetBackgroundDialog * self;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_handlers_destroy (self);
+static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->dialog);
-#line 1085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->desktop_background_button);
-#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->screensaver_button);
-#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->ok_button);
-#line 11279 "Dialogs.c"
-}
-
-
-GType set_background_dialog_get_type (void) {
-	static volatile gsize set_background_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&set_background_dialog_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_set_background_dialog_init, value_set_background_dialog_free_value, value_set_background_dialog_copy_value, value_set_background_dialog_peek_pointer, "p", value_set_background_dialog_collect_value, "p", value_set_background_dialog_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundDialog), 0, (GInstanceInitFunc) set_background_dialog_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType set_background_dialog_type_id;
-		set_background_dialog_type_id = g_type_register_fundamental (g_type_fundamental_next (), "SetBackgroundDialog", &g_define_type_info, &g_define_type_fundamental_info, G_TYPE_FLAG_ABSTRACT);
-		g_once_init_leave (&set_background_dialog_type_id__volatile, set_background_dialog_type_id);
-	}
-	return set_background_dialog_type_id__volatile;
-}
-
-
-gpointer set_background_dialog_ref (gpointer instance) {
-	SetBackgroundDialog* self;
-	self = instance;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return instance;
-#line 11304 "Dialogs.c"
-}
-
-
-void set_background_dialog_unref (gpointer instance) {
-	SetBackgroundDialog* self;
-	self = instance;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		SET_BACKGROUND_DIALOG_GET_CLASS (self)->finalize (self);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 11317 "Dialogs.c"
-	}
-}
-
-
-SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
-	SetBackgroundPhotoDialog* self = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_window_create_builder ("set_background_dialog.ui", self);
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	builder = _tmp0_;
-#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundPhotoDialog*) set_background_dialog_construct (object_type, builder);
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (builder);
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 11336 "Dialogs.c"
-}
-
-
-SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 11343 "Dialogs.c"
+	set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self);
+#line 10888 "Dialogs.c"
 }
 
 
@@ -11363,51 +10908,103 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gint _tmp0_ = 0;
+	GtkCheckButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gboolean _tmp3_ = FALSE;
+	GtkCheckButton* _tmp4_ = NULL;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
-#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = set_background_dialog_execute_base (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog));
-#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp0_;
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->desktop;
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_desktop_background = _tmp1_;
-#line 1141 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->screensaver;
-#line 1141 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_screensaver = _tmp2_;
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp1_ = self->priv->desktop_background_checkbox;
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = _tmp2_;
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_desktop_background = _tmp3_;
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = self->priv->screensaver_checkbox;
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp6_ = _tmp5_;
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_screensaver = _tmp6_;
+#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11375 "Dialogs.c"
+#line 10938 "Dialogs.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11381 "Dialogs.c"
+#line 10944 "Dialogs.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11385 "Dialogs.c"
+#line 10948 "Dialogs.c"
 }
 
 
 static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
-#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gint SetBackgroundPhotoDialog_private_offset;
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 11392 "Dialogs.c"
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_type_class_add_private (klass, sizeof (SetBackgroundPhotoDialogPrivate));
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	G_OBJECT_CLASS (klass)->finalize = set_background_photo_dialog_finalize;
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	SetBackgroundPhotoDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_dialog.ui");
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, desktop_background_checkbox));
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox));
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
+#line 10970 "Dialogs.c"
 }
 
 
 static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) {
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self);
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 10979 "Dialogs.c"
+}
+
+
+static void set_background_photo_dialog_finalize (GObject* obj) {
+	SetBackgroundPhotoDialog * self;
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog);
+#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->desktop_background_checkbox);
+#line 1088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->screensaver_checkbox);
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj);
+#line 10993 "Dialogs.c"
 }
 
 
@@ -11416,78 +11013,112 @@ GType set_background_photo_dialog_get_type (void) {
 	if (g_once_init_enter (&set_background_photo_dialog_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundPhotoDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_photo_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundPhotoDialog), 0, (GInstanceInitFunc) set_background_photo_dialog_instance_init, NULL };
 		GType set_background_photo_dialog_type_id;
-		set_background_photo_dialog_type_id = g_type_register_static (TYPE_SET_BACKGROUND_DIALOG, "SetBackgroundPhotoDialog", &g_define_type_info, 0);
+		set_background_photo_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundPhotoDialog", &g_define_type_info, 0);
 		g_once_init_leave (&set_background_photo_dialog_type_id__volatile, set_background_photo_dialog_type_id);
 	}
 	return set_background_photo_dialog_type_id__volatile;
 }
 
 
-static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 11415 "Dialogs.c"
-}
-
-
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) {
-	SetBackgroundSlideshowDialog* self = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GObject* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
-	GtkScale* _tmp6_ = NULL;
-	GtkAdjustment* _tmp7_ = NULL;
-	GtkAdjustment* _tmp8_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_window_create_builder ("set_background_slideshow_dialog.ui", self);
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	builder = _tmp0_;
-#line 1154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundSlideshowDialog*) set_background_dialog_construct (object_type, builder);
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_builder_get_object (builder, "delay_value_label");
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp1_) : NULL);
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_value_label);
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->delay_value_label = _tmp2_;
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_builder_get_object (builder, "delay_scale");
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp3_) : NULL);
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_scale);
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->delay_scale = _tmp4_;
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->delay_scale;
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed, self);
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = self->priv->delay_scale;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange));
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _tmp7_;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_adjustment_set_value (_tmp8_, (gdouble) 50);
-#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (builder);
-#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	SetBackgroundSlideshowDialog * self = NULL;
+	gboolean use_header = FALSE;
+	GtkSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gboolean _tmp2_ = FALSE;
+	AppWindow* _tmp3_ = NULL;
+	AppWindow* _tmp4_ = NULL;
+#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = gtk_settings_get_default ();
+#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = use_header;
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp2_) {
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 1;
+#line 11027 "Dialogs.c"
+	} else {
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 0;
+#line 11031 "Dialogs.c"
+	}
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = app_window_get_instance ();
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = _tmp3_;
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (_tmp4_);
+#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11469 "Dialogs.c"
+#line 11045 "Dialogs.c"
 }
 
 
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
-#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 11476 "Dialogs.c"
+#line 11052 "Dialogs.c"
+}
+
+
+static void set_background_slideshow_dialog_real_constructed (GObject* base) {
+	SetBackgroundSlideshowDialog * self;
+#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
+#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	set_background_slideshow_dialog_on_delay_scale_value_changed (self);
+#line 11062 "Dialogs.c"
+}
+
+
+static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkCheckButton* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
+#line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp1_ = self->priv->desktop_background_checkbox;
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = _tmp2_;
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp3_) {
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp0_ = TRUE;
+#line 11083 "Dialogs.c"
+	} else {
+		GtkCheckButton* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp4_ = self->priv->screensaver_checkbox;
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp6_ = _tmp5_;
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp0_ = _tmp6_;
+#line 11096 "Dialogs.c"
+	}
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
+#line 11100 "Dialogs.c"
+}
+
+
+static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self);
+#line 11107 "Dialogs.c"
 }
 
 
@@ -11505,57 +11136,57 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 	gint _tmp8_ = 0;
 	GtkLabel* _tmp29_ = NULL;
 	const gchar* _tmp30_ = NULL;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->delay_scale;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value = _tmp4_;
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = value;
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = pow (_tmp5_, (gdouble) 5);
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = pow ((gdouble) 90, (gdouble) 5);
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5);
-#line 1173 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->delay_value;
-#line 1173 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ < 60) {
-#line 11520 "Dialogs.c"
+#line 11151 "Dialogs.c"
 		gint _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
 		gchar* _tmp12_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->delay_value;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = ngettext ("%d second", "%d seconds", (gulong) _tmp9_);
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = self->priv->delay_value;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp12_;
-#line 11537 "Dialogs.c"
+#line 11168 "Dialogs.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->delay_value;
-#line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp13_ < (60 * 60)) {
-#line 11544 "Dialogs.c"
+#line 11175 "Dialogs.c"
 			gint minutes = 0;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
@@ -11563,34 +11194,34 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 			gint _tmp17_ = 0;
 			gchar* _tmp18_ = NULL;
 			gint _tmp19_ = 0;
-#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = self->priv->delay_value;
-#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			minutes = _tmp14_ / 60;
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = minutes;
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = ngettext ("%d minute", "%d minutes", (gulong) _tmp15_);
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = minutes;
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp18_;
-#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = minutes;
-#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			self->priv->delay_value = _tmp19_ * 60;
-#line 11572 "Dialogs.c"
+#line 11203 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = self->priv->delay_value;
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp20_ < ((60 * 60) * 24)) {
-#line 11579 "Dialogs.c"
+#line 11210 "Dialogs.c"
 				gint hours = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -11598,53 +11229,60 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 				gint _tmp24_ = 0;
 				gchar* _tmp25_ = NULL;
 				gint _tmp26_ = 0;
-#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = self->priv->delay_value;
-#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				hours = _tmp21_ / (60 * 60);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = hours;
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp23_ = ngettext ("%d hour", "%d hours", (gulong) _tmp22_);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = hours;
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp25_ = g_strdup_printf (_tmp23_, _tmp24_);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp25_;
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = hours;
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = _tmp26_ * (60 * 60);
-#line 11607 "Dialogs.c"
+#line 11238 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = _ ("1 day");
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strdup (_tmp27_);
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 1185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = (60 * 60) * 24;
-#line 11621 "Dialogs.c"
+#line 11252 "Dialogs.c"
 			}
 		}
 	}
-#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->delay_value_label;
-#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = text;
-#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_label (_tmp29_, _tmp30_);
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 11633 "Dialogs.c"
+#line 11264 "Dialogs.c"
+}
+
+
+static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
+#line 11271 "Dialogs.c"
 }
 
 
@@ -11654,85 +11292,128 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	GtkCheckButton* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1191 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gboolean _tmp4_ = FALSE;
+	GtkCheckButton* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_ = FALSE;
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = set_background_dialog_execute_base (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog));
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp0_;
-#line 1194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->delay_value;
-#line 1194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_delay_value = _tmp1_;
-#line 1195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->desktop;
-#line 1195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_desktop_background = _tmp2_;
-#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->screensaver;
-#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_screensaver = _tmp3_;
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = self->priv->desktop_background_checkbox;
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = _tmp3_;
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_desktop_background = _tmp4_;
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = self->priv->screensaver_checkbox;
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp7_ = _tmp6_;
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_screensaver = _tmp7_;
+#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (delay_value) {
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*delay_value = _vala_delay_value;
-#line 11671 "Dialogs.c"
+#line 11327 "Dialogs.c"
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11677 "Dialogs.c"
+#line 11333 "Dialogs.c"
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11683 "Dialogs.c"
+#line 11339 "Dialogs.c"
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11687 "Dialogs.c"
+#line 11343 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) {
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gint SetBackgroundSlideshowDialog_private_offset;
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((SetBackgroundDialogClass *) klass)->finalize = set_background_slideshow_dialog_finalize;
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate));
-#line 11698 "Dialogs.c"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	((GObjectClass *) klass)->constructed = set_background_slideshow_dialog_real_constructed;
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	G_OBJECT_CLASS (klass)->finalize = set_background_slideshow_dialog_finalize;
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	SetBackgroundSlideshowDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_slideshow_dialog.ui");
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, desktop_background_checkbox));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, screensaver_checkbox));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_scale", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_scale));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_value_label", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_value_label));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_delay_scale_value_changed", G_CALLBACK(_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed));
+#line 11373 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) {
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value = 0;
-#line 11707 "Dialogs.c"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 11384 "Dialogs.c"
 }
 
 
-static void set_background_slideshow_dialog_finalize (SetBackgroundDialog* obj) {
+static void set_background_slideshow_dialog_finalize (GObject* obj) {
 	SetBackgroundSlideshowDialog * self;
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_value_label);
-#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->desktop_background_checkbox);
+#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->screensaver_checkbox);
+#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->delay_scale);
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	SET_BACKGROUND_DIALOG_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 11721 "Dialogs.c"
+#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->delay_value_label);
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
+#line 11402 "Dialogs.c"
 }
 
 
@@ -11741,7 +11422,7 @@ GType set_background_slideshow_dialog_get_type (void) {
 	if (g_once_init_enter (&set_background_slideshow_dialog_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundSlideshowDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_slideshow_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundSlideshowDialog), 0, (GInstanceInitFunc) set_background_slideshow_dialog_instance_init, NULL };
 		GType set_background_slideshow_dialog_type_id;
-		set_background_slideshow_dialog_type_id = g_type_register_static (TYPE_SET_BACKGROUND_DIALOG, "SetBackgroundSlideshowDialog", &g_define_type_info, 0);
+		set_background_slideshow_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundSlideshowDialog", &g_define_type_info, 0);
 		g_once_init_leave (&set_background_slideshow_dialog_type_id__volatile, set_background_slideshow_dialog_type_id);
 	}
 	return set_background_slideshow_dialog_type_id__volatile;
@@ -11754,60 +11435,60 @@ TextEntryDialog* text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 11753 "Dialogs.c"
+#line 11434 "Dialogs.c"
 	} else {
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 11757 "Dialogs.c"
+#line 11438 "Dialogs.c"
 	}
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11763 "Dialogs.c"
+#line 11444 "Dialogs.c"
 }
 
 
 TextEntryDialog* text_entry_dialog_new (void) {
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
-#line 11770 "Dialogs.c"
+#line 11451 "Dialogs.c"
 }
 
 
 void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 11789 "Dialogs.c"
+#line 11470 "Dialogs.c"
 }
 
 
 static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
-#line 11796 "Dialogs.c"
+#line 11477 "Dialogs.c"
 }
 
 
@@ -11839,150 +11520,150 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
 	GtkWidget* _tmp23_ = NULL;
 	GtkButton* _tmp24_ = NULL;
 	GeeCollection* _tmp25_ = NULL;
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list));
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "label");
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	name_label = _tmp9_;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = name_label;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = label;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp10_, _tmp11_);
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->builder;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = gtk_builder_get_object (_tmp12_, "entry");
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL);
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp14_;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = initial_text;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 11896 "Dialogs.c"
+#line 11577 "Dialogs.c"
 		const gchar* _tmp17_ = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = initial_text;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp17_;
-#line 11902 "Dialogs.c"
+#line 11583 "Dialogs.c"
 	} else {
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = "";
-#line 11906 "Dialogs.c"
+#line 11587 "Dialogs.c"
 	}
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->entry;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (_tmp18_, _tmp15_);
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->entry;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button1 = _tmp22_;
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button2 = _tmp24_;
-#line 1239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = completion_list;
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp25_ != NULL) {
-#line 11942 "Dialogs.c"
+#line 11623 "Dialogs.c"
 		EntryMultiCompletion* completion = NULL;
 		GeeCollection* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
 		EntryMultiCompletion* _tmp28_ = NULL;
 		GtkEntry* _tmp29_ = NULL;
 		EntryMultiCompletion* _tmp30_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = completion_list;
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = completion_delimiter;
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = entry_multi_completion_new (_tmp26_, _tmp27_);
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		completion = _tmp28_;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = self->priv->entry;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = completion;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_completion (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (completion);
-#line 11965 "Dialogs.c"
+#line 11646 "Dialogs.c"
 	}
-#line 1247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (name_label);
-#line 11971 "Dialogs.c"
+#line 11652 "Dialogs.c"
 }
 
 
@@ -11997,57 +11678,57 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 	gint _tmp4_ = 0;
 	GtkEntry* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-#line 1250 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 1256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12008 "Dialogs.c"
+#line 11689 "Dialogs.c"
 		GtkEntry* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->entry;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp7_;
-#line 12022 "Dialogs.c"
+#line 11703 "Dialogs.c"
 	}
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->entry;
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE);
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12036 "Dialogs.c"
+#line 11717 "Dialogs.c"
 }
 
 
@@ -12057,57 +11738,57 @@ void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 12060 "Dialogs.c"
+#line 11741 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (TextEntryDialogPrivate));
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = text_entry_dialog_finalize;
-#line 12071 "Dialogs.c"
+#line 11752 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_instance_init (TextEntryDialog * self) {
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12078 "Dialogs.c"
+#line 11759 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_finalize (GObject* obj) {
 	TextEntryDialog * self;
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog);
-#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1209 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (text_entry_dialog_parent_class)->finalize (obj);
-#line 12096 "Dialogs.c"
+#line 11777 "Dialogs.c"
 }
 
 
@@ -12129,53 +11810,53 @@ MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 12128 "Dialogs.c"
+#line 11809 "Dialogs.c"
 	} else {
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 12132 "Dialogs.c"
+#line 11813 "Dialogs.c"
 	}
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12138 "Dialogs.c"
+#line 11819 "Dialogs.c"
 }
 
 
 MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
-#line 12145 "Dialogs.c"
+#line 11826 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 12164 "Dialogs.c"
+#line 11845 "Dialogs.c"
 }
 
 
@@ -12205,117 +11886,117 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi
 	GtkButton* _tmp22_ = NULL;
 	GtkWidget* _tmp23_ = NULL;
 	GtkButton* _tmp24_ = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), 500, 300);
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "textview1");
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp8_) : NULL);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp9_;
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->entry;
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_wrap_mode (_tmp10_, GTK_WRAP_WORD);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->entry;
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_text_buffer_new (NULL);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_buffer (_tmp11_, _tmp13_);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp13_);
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = initial_text;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp15_ != NULL) {
-#line 12262 "Dialogs.c"
+#line 11943 "Dialogs.c"
 		const gchar* _tmp16_ = NULL;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = initial_text;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp16_;
-#line 12268 "Dialogs.c"
+#line 11949 "Dialogs.c"
 	} else {
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = "";
-#line 12272 "Dialogs.c"
+#line 11953 "Dialogs.c"
 	}
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->entry;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_text_view_get_buffer (_tmp17_);
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _tmp18_;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_set (_tmp19_, "text", _tmp14_, NULL);
-#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button1 = _tmp22_;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button2 = _tmp24_;
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 12304 "Dialogs.c"
+#line 11985 "Dialogs.c"
 }
 
 
@@ -12323,81 +12004,81 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 	gchar* result = NULL;
 	gchar* text = NULL;
 	gint _tmp0_ = 0;
-#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12322 "Dialogs.c"
+#line 12003 "Dialogs.c"
 		GtkTextView* _tmp1_ = NULL;
 		GtkTextBuffer* _tmp2_ = NULL;
 		GtkTextBuffer* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->entry;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_text_view_get_buffer (_tmp1_);
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp2_;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_get (_tmp3_, "text", &_tmp4_, NULL);
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp5_;
-#line 12342 "Dialogs.c"
+#line 12023 "Dialogs.c"
 	}
-#line 1319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12350 "Dialogs.c"
+#line 12031 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) {
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogPrivate));
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = multi_text_entry_dialog_finalize;
-#line 12361 "Dialogs.c"
+#line 12042 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12368 "Dialogs.c"
+#line 12049 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_finalize (GObject* obj) {
 	MultiTextEntryDialog * self;
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
-#line 1276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1279 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
-#line 12386 "Dialogs.c"
+#line 12067 "Dialogs.c"
 }
 
 
@@ -12418,24 +12099,24 @@ EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Rename Event");
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Name:");
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_name;
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12417 "Dialogs.c"
+#line 12098 "Dialogs.c"
 }
 
 
 EventRenameDialog* event_rename_dialog_new (const gchar* event_name) {
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return event_rename_dialog_construct (TYPE_EVENT_RENAME_DIALOG, event_name);
-#line 12424 "Dialogs.c"
+#line 12105 "Dialogs.c"
 }
 
 
@@ -12445,39 +12126,39 @@ static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_prep_event_name (_tmp1_);
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12448 "Dialogs.c"
+#line 12129 "Dialogs.c"
 }
 
 
 gchar* event_rename_dialog_execute (EventRenameDialog* self) {
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EVENT_RENAME_DIALOG (self), NULL);
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EVENT_RENAME_DIALOG_GET_CLASS (self)->execute (self);
-#line 12457 "Dialogs.c"
+#line 12138 "Dialogs.c"
 }
 
 
 static void event_rename_dialog_class_init (EventRenameDialogClass * klass) {
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	event_rename_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EventRenameDialogClass *) klass)->execute = event_rename_dialog_real_execute;
-#line 12466 "Dialogs.c"
+#line 12147 "Dialogs.c"
 }
 
 
@@ -12502,24 +12183,24 @@ EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* ph
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = C_ ("Dialog Title", "Edit Title");
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Title:");
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_title;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12501 "Dialogs.c"
+#line 12182 "Dialogs.c"
 }
 
 
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title) {
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_title_dialog_construct (TYPE_EDIT_TITLE_DIALOG, photo_title);
-#line 12508 "Dialogs.c"
+#line 12189 "Dialogs.c"
 }
 
 
@@ -12529,56 +12210,56 @@ static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_title (_tmp1_);
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12532 "Dialogs.c"
+#line 12213 "Dialogs.c"
 }
 
 
 gchar* edit_title_dialog_execute (EditTitleDialog* self) {
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_TITLE_DIALOG (self), NULL);
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_TITLE_DIALOG_GET_CLASS (self)->execute (self);
-#line 12541 "Dialogs.c"
+#line 12222 "Dialogs.c"
 }
 
 
 static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) {
 	EditTitleDialog * self;
 	gboolean result = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_DIALOG, EditTitleDialog);
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12556 "Dialogs.c"
+#line 12237 "Dialogs.c"
 }
 
 
 static void edit_title_dialog_class_init (EditTitleDialogClass * klass) {
-#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_title_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditTitleDialogClass *) klass)->execute = edit_title_dialog_real_execute;
-#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_title_dialog_real_on_modify_validate;
-#line 12567 "Dialogs.c"
+#line 12248 "Dialogs.c"
 }
 
 
@@ -12606,47 +12287,47 @@ EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar
 	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = is_event;
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 12599 "Dialogs.c"
+#line 12280 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = _ ("Edit Event Comment");
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp2_;
-#line 12605 "Dialogs.c"
+#line 12286 "Dialogs.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("Edit Photo/Video Comment");
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp3_;
-#line 12612 "Dialogs.c"
+#line 12293 "Dialogs.c"
 	}
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup (_tmp0_);
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title_tmp = _tmp4_;
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _ ("Comment:");
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = comment;
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _tmp5_, _tmp6_);
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title_tmp);
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12628 "Dialogs.c"
+#line 12309 "Dialogs.c"
 }
 
 
 EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event) {
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_comment_dialog_construct (TYPE_EDIT_COMMENT_DIALOG, comment, is_event);
-#line 12635 "Dialogs.c"
+#line 12316 "Dialogs.c"
 }
 
 
@@ -12656,56 +12337,56 @@ static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _multi_text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator));
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_comment (_tmp1_);
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12659 "Dialogs.c"
+#line 12340 "Dialogs.c"
 }
 
 
 gchar* edit_comment_dialog_execute (EditCommentDialog* self) {
-#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_COMMENT_DIALOG (self), NULL);
-#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_COMMENT_DIALOG_GET_CLASS (self)->execute (self);
-#line 12668 "Dialogs.c"
+#line 12349 "Dialogs.c"
 }
 
 
 static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, const gchar* text) {
 	EditCommentDialog * self;
 	gboolean result = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_DIALOG, EditCommentDialog);
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12683 "Dialogs.c"
+#line 12364 "Dialogs.c"
 }
 
 
 static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) {
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_comment_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditCommentDialogClass *) klass)->execute = edit_comment_dialog_real_execute;
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_comment_dialog_real_on_modify_validate;
-#line 12694 "Dialogs.c"
+#line 12375 "Dialogs.c"
 }
 
 
@@ -12742,63 +12423,63 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title
 	gchar* _tmp10_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp11_ = 0;
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	trash_action = _tmp2_;
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = user_message;
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp4_);
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp5_);
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("_Remove From Library");
-#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_NO);
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), trash_action, (gint) GTK_RESPONSE_YES);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = title;
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = user_message;
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = build_alert_body_text (_tmp7_, _tmp8_, TRUE);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp10_);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp11_;
-#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (trash_action);
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12787 "Dialogs.c"
+#line 12468 "Dialogs.c"
 }
 
 
@@ -12816,57 +12497,57 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 	gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = owner;
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = user_message;
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp1_);
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp2_;
-#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _ ("_Keep");
-#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp3_, (gint) GTK_RESPONSE_NO);
-#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("_Delete");
-#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp4_, (gint) GTK_RESPONSE_YES);
-#line 1399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_NO);
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = title;
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = user_message;
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp8_);
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp8_);
-#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 1405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12855 "Dialogs.c"
+#line 12536 "Dialogs.c"
 }
 
 
@@ -12905,26 +12586,26 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 	gint _tmp37_ = 0;
 	GtkMessageDialog* _tmp38_ = NULL;
 	GtkResponseType _tmp39_ = 0;
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), FALSE);
-#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	count = 0;
-#line 12900 "Dialogs.c"
+#line 12581 "Dialogs.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = photos;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_photo_it = _tmp1_;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 12913 "Dialogs.c"
+#line 12594 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			Photo* photo = NULL;
@@ -12932,171 +12613,171 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 			gpointer _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _photo_it;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 12929 "Dialogs.c"
+#line 12610 "Dialogs.c"
 			}
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _photo_it;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			photo = (Photo*) _tmp5_;
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = photo;
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = photo_has_editable (_tmp6_);
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp7_) {
-#line 12943 "Dialogs.c"
+#line 12624 "Dialogs.c"
 				gint _tmp8_ = 0;
-#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = count;
-#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				count = _tmp8_ + 1;
-#line 12949 "Dialogs.c"
+#line 12630 "Dialogs.c"
 			}
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (photo);
-#line 12953 "Dialogs.c"
+#line 12634 "Dialogs.c"
 		}
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_photo_it);
-#line 12957 "Dialogs.c"
+#line 12638 "Dialogs.c"
 	}
-#line 1417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = count;
-#line 1417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ == 0) {
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 12967 "Dialogs.c"
+#line 12648 "Dialogs.c"
 	}
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = count;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == 1) {
-#line 12973 "Dialogs.c"
+#line 12654 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _ ("Revert External Edit?");
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp12_;
-#line 12979 "Dialogs.c"
+#line 12660 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Revert External Edits?");
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp13_;
-#line 12986 "Dialogs.c"
+#line 12667 "Dialogs.c"
 	}
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	headline = _tmp14_;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = count;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp15_);
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = count;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp18_;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = count;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ == 1) {
-#line 13006 "Dialogs.c"
+#line 12687 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _ ("Re_vert External Edit");
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp21_;
-#line 13012 "Dialogs.c"
+#line 12693 "Dialogs.c"
 	} else {
 		const gchar* _tmp22_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = _ ("Re_vert External Edits");
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp22_;
-#line 13019 "Dialogs.c"
+#line 12700 "Dialogs.c"
 	}
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = g_strdup (_tmp19_);
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	action = _tmp23_;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = owner;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = msg;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp24_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp25_);
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp26_);
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp26_;
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = dialog;
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _ ("_Cancel");
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_dialog_get_type (), GtkDialog), _tmp28_, (gint) GTK_RESPONSE_CANCEL);
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = dialog;
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = action;
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_dialog_get_type (), GtkDialog), _tmp30_, (gint) GTK_RESPONSE_YES);
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = dialog;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = headline;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = msg;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = build_alert_body_text (_tmp32_, _tmp33_, TRUE);
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (_tmp31_, _tmp35_);
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp35_);
-#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = dialog;
-#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
-#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp37_;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = dialog;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = _result_;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp39_ == GTK_RESPONSE_YES;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (action);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (headline);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13085 "Dialogs.c"
+#line 12766 "Dialogs.c"
 }
 
 
@@ -13124,110 +12805,110 @@ gboolean remove_offline_dialog (GtkWindow* owner, gint count) {
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
 	GtkResponseType _tmp20_ = 0;
-#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == 0) {
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 13123 "Dialogs.c"
+#line 12804 "Dialogs.c"
 	}
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = count;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_);
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup_printf (_tmp2_, _tmp3_);
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp4_;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = msg;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp5_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp6_);
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp7_;
-#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = dialog;
-#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _ ("_Cancel");
-#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _tmp9_, (gint) GTK_RESPONSE_CANCEL);
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = dialog;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _ ("_Remove");
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog), _tmp11_, (gint) GTK_RESPONSE_OK);
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = count;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_ == 1) {
-#line 13161 "Dialogs.c"
+#line 12842 "Dialogs.c"
 		const gchar* _tmp14_ = NULL;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _ ("Remove Photo From Library");
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp14_;
-#line 13167 "Dialogs.c"
+#line 12848 "Dialogs.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _ ("Remove Photos From Library");
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp15_;
-#line 13174 "Dialogs.c"
+#line 12855 "Dialogs.c"
 	}
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = dialog;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), _tmp12_);
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = dialog;
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp18_;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = dialog;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = _result_;
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_ == GTK_RESPONSE_OK;
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13200 "Dialogs.c"
+#line 12881 "Dialogs.c"
 }
 
 
 static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel ((ProgressDialog*) self);
-#line 13207 "Dialogs.c"
+#line 12888 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = progress_dialog_on_window_closed ((ProgressDialog*) self);
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13216 "Dialogs.c"
+#line 12897 "Dialogs.c"
 }
 
 
@@ -13258,207 +12939,207 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	GtkBox* _tmp23_ = NULL;
 	GtkBox* _tmp24_ = NULL;
 	gulong _tmp25_ = 0UL;
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ProgressDialog*) g_object_new (object_type, NULL);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = cancellable;
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancellable = _tmp1_;
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ != NULL) {
-#line 13273 "Dialogs.c"
+#line 12954 "Dialogs.c"
 		GtkWindow* _tmp4_ = NULL;
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = owner;
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 13279 "Dialogs.c"
+#line 12960 "Dialogs.c"
 	}
-#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->progress_bar;
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_show_text (_tmp6_, TRUE);
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox_bar = _tmp7_;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = vbox_bar;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->progress_bar;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = cancellable;
-#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp10_ != NULL) {
-#line 13309 "Dialogs.c"
+#line 12990 "Dialogs.c"
 		GtkButton* _tmp11_ = NULL;
 		GtkButton* _tmp12_ = NULL;
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp11_);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->cancel_button);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->cancel_button = _tmp11_;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->cancel_button;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
-#line 13326 "Dialogs.c"
+#line 13007 "Dialogs.c"
 	}
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp13_);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp13_;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = hbox;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = vbox_bar;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->cancel_button;
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 13344 "Dialogs.c"
+#line 13025 "Dialogs.c"
 		GtkBox* _tmp17_ = NULL;
 		GtkButton* _tmp18_ = NULL;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = hbox;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->cancel_button;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 13353 "Dialogs.c"
+#line 13034 "Dialogs.c"
 	}
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = (GtkLabel*) gtk_label_new ("");
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp19_);
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text_label = _tmp19_;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = text;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", _tmp20_);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (primary_text_label, _tmp22_);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp22_);
-#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (primary_text_label, 0.0f);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (primary_text_label, 0.5f);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp23_);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox = _tmp23_;
-#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = hbox;
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
-#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = now_ms ();
-#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->time_started = _tmp25_;
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text_label);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox_bar);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 13419 "Dialogs.c"
+#line 13100 "Dialogs.c"
 }
 
 
 ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
-#line 13426 "Dialogs.c"
+#line 13107 "Dialogs.c"
 }
 
 
 static void progress_dialog_real_realize (GtkWidget* base) {
 	ProgressDialog * self;
 	GCancellable* _tmp0_ = NULL;
-#line 1525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	GTK_WIDGET_CLASS (progress_dialog_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 13441 "Dialogs.c"
+#line 13122 "Dialogs.c"
 		GdkWindow* _tmp1_ = NULL;
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
-#line 13447 "Dialogs.c"
+#line 13128 "Dialogs.c"
 	}
 }
 
@@ -13466,44 +13147,44 @@ static void progress_dialog_real_realize (GtkWidget* base) {
 void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = update_every;
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ >= 1, "update_every >= 1");
-#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = update_every;
-#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = _tmp1_;
-#line 13465 "Dialogs.c"
+#line 13146 "Dialogs.c"
 }
 
 
 void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
 	gint _tmp0_ = 0;
-#line 1539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = minimum_on_screen_time_msec;
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = _tmp0_;
-#line 13477 "Dialogs.c"
+#line 13158 "Dialogs.c"
 }
 
 
 void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = current;
-#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = total;
-#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
-#line 13492 "Dialogs.c"
+#line 13173 "Dialogs.c"
 }
 
 
@@ -13518,58 +13199,58 @@ void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
 	gdouble _tmp7_ = 0.0;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 1547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = pct;
-#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0.0, 1.0);
-#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pct = _tmp1_;
-#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pct;
-#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_maybe_show_all (self, _tmp2_);
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pct;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("%d%%");
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = pct;
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup_printf (_tmp6_, (gint) (_tmp7_ * 100.0));
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp5_, _tmp9_);
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp9_);
-#line 13539 "Dialogs.c"
+#line 13220 "Dialogs.c"
 }
 
 
 void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->progress_bar;
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13558 "Dialogs.c"
+#line 13239 "Dialogs.c"
 }
 
 
@@ -13581,131 +13262,131 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 	GCancellable* _tmp9_ = NULL;
 	gboolean keep_going = FALSE;
 	gboolean _tmp12_ = FALSE;
-#line 1572 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->last_count;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == G_MAXUINT64) {
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 13578 "Dialogs.c"
+#line 13259 "Dialogs.c"
 	} else {
 		guint64 _tmp2_ = 0ULL;
 		guint64 _tmp3_ = 0ULL;
 		gint _tmp4_ = 0;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = count;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->last_count;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->update_every;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
-#line 13591 "Dialogs.c"
+#line 13272 "Dialogs.c"
 	}
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13595 "Dialogs.c"
+#line 13276 "Dialogs.c"
 		guint64 _tmp5_ = 0ULL;
 		guint64 _tmp6_ = 0ULL;
 		guint64 _tmp7_ = 0ULL;
-#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = count;
-#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = total;
-#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_));
-#line 1575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = count;
-#line 1575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->last_count = _tmp7_;
-#line 13609 "Dialogs.c"
+#line 13290 "Dialogs.c"
 	}
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->cancellable;
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ != NULL) {
-#line 13615 "Dialogs.c"
+#line 13296 "Dialogs.c"
 		GCancellable* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->cancellable;
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = g_cancellable_is_cancelled (_tmp10_);
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp11_;
-#line 13624 "Dialogs.c"
+#line 13305 "Dialogs.c"
 	} else {
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = TRUE;
-#line 13628 "Dialogs.c"
+#line 13309 "Dialogs.c"
 	}
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	keep_going = _tmp8_;
-#line 1586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = do_event_loop;
-#line 1586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp12_) {
-#line 1587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		spin_event_loop ();
-#line 13638 "Dialogs.c"
+#line 13319 "Dialogs.c"
 	}
-#line 1589 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = keep_going;
-#line 1589 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13644 "Dialogs.c"
+#line 13325 "Dialogs.c"
 }
 
 
 void progress_dialog_close (ProgressDialog* self) {
-#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13655 "Dialogs.c"
+#line 13336 "Dialogs.c"
 }
 
 
 static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
 	gboolean result = FALSE;
-#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel (self);
-#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13669 "Dialogs.c"
+#line 13350 "Dialogs.c"
 }
 
 
 static void progress_dialog_on_cancel (ProgressDialog* self) {
 	GCancellable* _tmp0_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ != NULL) {
-#line 13682 "Dialogs.c"
+#line 13363 "Dialogs.c"
 		GCancellable* _tmp1_ = NULL;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->cancellable;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_cancellable_cancel (_tmp1_);
-#line 13688 "Dialogs.c"
+#line 13369 "Dialogs.c"
 	}
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->cancel_button;
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 13694 "Dialogs.c"
+#line 13375 "Dialogs.c"
 }
 
 
@@ -13713,35 +13394,35 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 13710 "Dialogs.c"
+#line 13391 "Dialogs.c"
 		gulong _tmp3_ = 0UL;
 		gulong _tmp4_ = 0UL;
 		gint _tmp5_ = 0;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = now_ms ();
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->time_started;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->minimum_on_screen_time_msec;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
-#line 13722 "Dialogs.c"
+#line 13403 "Dialogs.c"
 	} else {
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 13726 "Dialogs.c"
+#line 13407 "Dialogs.c"
 	}
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13730 "Dialogs.c"
+#line 13411 "Dialogs.c"
 		gdouble pps = 0.0;
 		gdouble _tmp6_ = 0.0;
 		gint _tmp7_ = 0;
@@ -13749,80 +13430,80 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 		gdouble _tmp8_ = 0.0;
 		gdouble _tmp9_ = 0.0;
 		gint _tmp10_ = 0;
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = pct;
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->minimum_on_screen_time_msec;
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		pps = (_tmp6_ * 100.0) / _tmp7_;
-#line 1621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = pps;
-#line 1621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ttc = 100.0 / _tmp8_;
-#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = ttc;
-#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->minimum_on_screen_time_msec;
-#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ > ((gdouble) _tmp10_)) {
-#line 1629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			spin_event_loop ();
-#line 13758 "Dialogs.c"
+#line 13439 "Dialogs.c"
 		}
 	}
 }
 
 
 static void progress_dialog_class_init (ProgressDialogClass * klass) {
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (ProgressDialogPrivate));
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((GtkWidgetClass *) klass)->realize = progress_dialog_real_realize;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
-#line 13773 "Dialogs.c"
+#line 13454 "Dialogs.c"
 }
 
 
 static void progress_dialog_instance_init (ProgressDialog * self) {
 	GtkProgressBar* _tmp0_ = NULL;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->progress_bar = _tmp0_;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancel_button = NULL;
-#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->last_count = G_MAXUINT64;
-#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = 1;
-#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = 500;
-#line 13795 "Dialogs.c"
+#line 13476 "Dialogs.c"
 }
 
 
 static void progress_dialog_finalize (GObject* obj) {
 	ProgressDialog * self;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->progress_bar);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancel_button);
-#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
-#line 13811 "Dialogs.c"
+#line 13492 "Dialogs.c"
 }
 
 
@@ -13851,68 +13532,68 @@ static GType adjust_date_time_dialog_time_system_get_type (void) {
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13842 "Dialogs.c"
+#line 13523 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13849 "Dialogs.c"
+#line 13530 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13856 "Dialogs.c"
+#line 13537 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
-#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13863 "Dialogs.c"
+#line 13544 "Dialogs.c"
 }
 
 
 static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) {
 	gboolean result;
 	result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13872 "Dialogs.c"
+#line 13553 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
-#line 13879 "Dialogs.c"
+#line 13560 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13886 "Dialogs.c"
+#line 13567 "Dialogs.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
-#line 13901 "Dialogs.c"
+#line 13582 "Dialogs.c"
 }
 
 
@@ -14048,367 +13729,367 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 	ConfigFacade* _tmp158_ = NULL;
 	gboolean _tmp159_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_DATEABLE (source), NULL);
-#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = source;
-#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ != NULL, "source != null");
-#line 1670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_settings_get_default ();
-#line 1670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = use_header;
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_) {
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 1;
-#line 14053 "Dialogs.c"
+#line 13734 "Dialogs.c"
 	} else {
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 0;
-#line 14057 "Dialogs.c"
+#line 13738 "Dialogs.c"
 	}
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp2_, NULL);
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 1679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL);
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCalendar*) gtk_calendar_new ();
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->calendar = _tmp6_;
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->calendar;
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp7_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->calendar;
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp8_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->calendar;
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp9_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
-#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->calendar;
-#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp10_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp12_);
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_) {
-#line 14113 "Dialogs.c"
+#line 13794 "Dialogs.c"
 		GtkSpinButton* _tmp15_ = NULL;
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp15_);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp15_;
-#line 14123 "Dialogs.c"
+#line 13804 "Dialogs.c"
 	} else {
 		GtkSpinButton* _tmp16_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp16_);
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp16_;
-#line 14134 "Dialogs.c"
+#line 13815 "Dialogs.c"
 	}
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->hour;
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp17_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->hour;
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->hour;
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp20_);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minute = _tmp20_;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->priv->minute;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->minute;
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->minute;
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp23_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp24_);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->second = _tmp24_;
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = self->priv->second;
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->second;
-#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = self->priv->second;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp27_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp28_);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system = _tmp28_;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->system;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _ ("AM");
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp29_, _tmp30_);
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = self->priv->system;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _ ("PM");
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp31_, _tmp32_);
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = self->priv->system;
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _ ("24 Hr");
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp33_, _tmp34_);
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = self->priv->system;
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp36_);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	clock = _tmp36_;
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = clock;
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = self->priv->hour;
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = clock;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = (GtkLabel*) gtk_label_new (":");
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp40_);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = _tmp40_;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = clock;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = self->priv->minute;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = clock;
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = (GtkLabel*) gtk_label_new (":");
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp45_);
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = _tmp45_;
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp46_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = clock;
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = self->priv->second;
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = clock;
-#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = self->priv->system;
-#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = _ ("_Shift photos/videos by the same amount");
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _tmp51_);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp52_);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->relativity_radio_button = _tmp52_;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = self->priv->relativity_radio_button;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = config_facade_get_instance ();
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _tmp54_;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp56_);
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp55_);
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = display_options;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp58_) {
-#line 14300 "Dialogs.c"
+#line 13981 "Dialogs.c"
 		gint _tmp59_ = 0;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp59_ = photo_count;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = _tmp59_ > 1;
-#line 14306 "Dialogs.c"
+#line 13987 "Dialogs.c"
 	} else {
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = FALSE;
-#line 14310 "Dialogs.c"
+#line 13991 "Dialogs.c"
 	}
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = self->priv->relativity_radio_button;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), _tmp57_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = self->priv->relativity_radio_button;
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = gtk_radio_button_get_group (_tmp61_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = _ ("Set _all photos/videos to this time");
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp62_, _tmp63_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->batch_radio_button = _tmp64_;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->batch_radio_button;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = config_facade_get_instance ();
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = _tmp66_;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp68_);
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp67_);
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = display_options;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp70_) {
-#line 14346 "Dialogs.c"
+#line 14027 "Dialogs.c"
 		gint _tmp71_ = 0;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = photo_count;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = _tmp71_ > 1;
-#line 14352 "Dialogs.c"
+#line 14033 "Dialogs.c"
 	} else {
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = FALSE;
-#line 14356 "Dialogs.c"
+#line 14037 "Dialogs.c"
 	}
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = self->priv->batch_radio_button;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), _tmp69_);
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = self->priv->batch_radio_button;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = contains_video;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp74_) {
-#line 14370 "Dialogs.c"
+#line 14051 "Dialogs.c"
 		gchar* text = NULL;
 		gint _tmp75_ = 0;
 		const gchar* _tmp76_ = NULL;
 		gchar* _tmp77_ = NULL;
 		const gchar* _tmp78_ = NULL;
 		GtkCheckButton* _tmp79_ = NULL;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp75_ = photo_count;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp76_ = ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp75_);
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp77_ = g_strdup (_tmp76_);
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp77_;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp78_ = text;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp78_);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp79_);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp79_;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 14397 "Dialogs.c"
+#line 14078 "Dialogs.c"
 	} else {
 		gchar* text = NULL;
 		gint _tmp80_ = 0;
@@ -14416,181 +14097,181 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		gchar* _tmp82_ = NULL;
 		const gchar* _tmp83_ = NULL;
 		GtkCheckButton* _tmp84_ = NULL;
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp80_ = photo_count;
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp81_ = ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp80_);
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp82_ = g_strdup (_tmp81_);
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp82_;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = text;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp84_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp83_);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp84_);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp84_;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 14425 "Dialogs.c"
+#line 14106 "Dialogs.c"
 	}
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = config_facade_get_instance ();
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = _tmp86_;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = _tmp88_;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp87_);
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp89_) {
-#line 14439 "Dialogs.c"
+#line 14120 "Dialogs.c"
 		gboolean _tmp90_ = FALSE;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = display_options;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = _tmp90_;
-#line 14445 "Dialogs.c"
+#line 14126 "Dialogs.c"
 	} else {
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = FALSE;
-#line 14449 "Dialogs.c"
+#line 14130 "Dialogs.c"
 	}
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = self->priv->modify_originals_check_button;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp85_);
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp93_ = only_video;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp93_) {
-#line 14459 "Dialogs.c"
+#line 14140 "Dialogs.c"
 		gboolean _tmp94_ = FALSE;
 		ConfigFacade* _tmp95_ = NULL;
 		ConfigFacade* _tmp96_ = NULL;
 		gboolean _tmp97_ = FALSE;
 		gboolean _tmp98_ = FALSE;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = config_facade_get_instance ();
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = _tmp95_;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp97_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp98_ = !_tmp97_;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp96_);
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp98_) {
-#line 14477 "Dialogs.c"
+#line 14158 "Dialogs.c"
 			gboolean _tmp99_ = FALSE;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = display_options;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = _tmp99_;
-#line 14483 "Dialogs.c"
+#line 14164 "Dialogs.c"
 		} else {
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = FALSE;
-#line 14487 "Dialogs.c"
+#line 14168 "Dialogs.c"
 		}
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = _tmp94_;
-#line 14491 "Dialogs.c"
+#line 14172 "Dialogs.c"
 	} else {
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = FALSE;
-#line 14495 "Dialogs.c"
+#line 14176 "Dialogs.c"
 	}
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp100_ = self->priv->modify_originals_check_button;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget), _tmp92_);
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp101_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp101_);
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_content = _tmp101_;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp102_ = time_content;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp103_ = self->priv->calendar;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp104_ = time_content;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp105_ = clock;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp106_ = display_options;
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp106_) {
-#line 14523 "Dialogs.c"
+#line 14204 "Dialogs.c"
 		GtkBox* _tmp107_ = NULL;
 		GtkRadioButton* _tmp108_ = NULL;
 		GtkBox* _tmp109_ = NULL;
 		GtkRadioButton* _tmp110_ = NULL;
 		GtkBox* _tmp111_ = NULL;
 		GtkCheckButton* _tmp112_ = NULL;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp107_ = time_content;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp108_ = self->priv->relativity_radio_button;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp109_ = time_content;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp110_ = self->priv->batch_radio_button;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp111_ = time_content;
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp112_ = self->priv->modify_originals_check_button;
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp111_, G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 14548 "Dialogs.c"
+#line 14229 "Dialogs.c"
 	}
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preview = NULL;
-#line 14552 "Dialogs.c"
+#line 14233 "Dialogs.c"
 	{
 		GdkPixbuf* _tmp113_ = NULL;
 		Dateable* _tmp114_ = NULL;
 		GdkPixbuf* _tmp115_ = NULL;
 		GdkPixbuf* _tmp116_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp114_ = source;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp115_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = _tmp115_;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14566 "Dialogs.c"
+#line 14247 "Dialogs.c"
 			goto __catch422_g_error;
 		}
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp113_;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preview = _tmp116_;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp113_);
-#line 14579 "Dialogs.c"
+#line 14260 "Dialogs.c"
 	}
 	goto __finally422;
 	__catch422_g_error:
@@ -14599,235 +14280,235 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		Dateable* _tmp117_ = NULL;
 		gchar* _tmp118_ = NULL;
 		gchar* _tmp119_ = NULL;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		err = _inner_error_;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp117_ = source;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp118_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_DATA_OBJECT, DataObject));
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp119_ = _tmp118_;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_warning ("Dialogs.vala:1765: Unable to fetch preview for %s", _tmp119_);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_warning ("Dialogs.vala:1755: Unable to fetch preview for %s", _tmp119_);
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp119_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (err);
-#line 14604 "Dialogs.c"
+#line 14285 "Dialogs.c"
 	}
 	__finally422:
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (time_content);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (clock);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return NULL;
-#line 14621 "Dialogs.c"
+#line 14302 "Dialogs.c"
 	}
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp120_);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image_content = _tmp120_;
-#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = image_content;
-#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = image_content;
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_set_homogeneous (_tmp122_, TRUE);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = preview;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp124_ != NULL) {
-#line 14641 "Dialogs.c"
+#line 14322 "Dialogs.c"
 		GdkPixbuf* _tmp125_ = NULL;
 		GtkImage* _tmp126_ = NULL;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp125_ = preview;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp126_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp125_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp126_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp126_;
-#line 14654 "Dialogs.c"
+#line 14335 "Dialogs.c"
 	} else {
 		GtkImage* _tmp127_ = NULL;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = (GtkImage*) gtk_image_new ();
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp127_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp127_;
-#line 14665 "Dialogs.c"
+#line 14346 "Dialogs.c"
 	}
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp128_ = _g_object_ref0 (_tmp123_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image = _tmp128_;
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp129_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp129_);
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->original_time_label = _tmp129_;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp130_ = image_content;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp131_ = image;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp130_, G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp132_ = image_content;
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp133_ = self->priv->original_time_label;
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp134_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp134_;
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp135_ = hbox;
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_container_get_type (), GtkContainer), (guint) 3);
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp136_ = hbox;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp137_ = image_content;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp136_, G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp138_ = hbox;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp139_ = time_content;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp138_, G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp140_ = hbox;
-#line 1780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp141_ = hbox;
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp142_ = hbox;
-#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp143_ = hbox;
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp144_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp145_ = hbox;
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp146_ = (GtkLabel*) gtk_label_new ("");
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp146_);
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->notification = _tmp146_;
-#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp147_ = self->priv->notification;
-#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_line_wrap (_tmp147_, TRUE);
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp148_ = self->priv->notification;
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_justify (_tmp148_, GTK_JUSTIFY_CENTER);
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp149_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp150_ = self->priv->notification;
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp151_ = source;
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp152_ = dateable_get_exposure_time (_tmp151_);
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->original_time = _tmp152_;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp153_ = self->priv->original_time;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp153_ == ((time_t) 0)) {
-#line 14767 "Dialogs.c"
+#line 14448 "Dialogs.c"
 		time_t _tmp154_ = 0;
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp154_ = time (NULL);
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->original_time = _tmp154_;
-#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->no_original_time = TRUE;
-#line 14775 "Dialogs.c"
+#line 14456 "Dialogs.c"
 	}
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp155_ = self->priv->original_time;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_time_local (_tmp155_, &_tmp156_);
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_set_time (self, &_tmp156_);
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp157_ = config_facade_get_instance ();
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp158_ = _tmp157_;
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp159_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_set_original_time_label (self, _tmp159_);
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp158_);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp123_);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image_content);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (preview);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (time_content);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (clock);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 14809 "Dialogs.c"
+#line 14490 "Dialogs.c"
 }
 
 
 AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
-#line 14816 "Dialogs.c"
+#line 14497 "Dialogs.c"
 }
 
 
@@ -14852,60 +14533,60 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 	gint _tmp31_ = 0;
 	GtkComboBoxText* _tmp32_ = NULL;
 	gint _tmp33_ = 0;
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (time != NULL);
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->calendar;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = *time;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_.tm_mon;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = *time;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_.tm_year;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_month (_tmp0_, (guint) _tmp2_, (guint) (_tmp4_ + ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET));
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->calendar;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = *time;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_.tm_mday;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_day (_tmp5_, (guint) _tmp7_);
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_) {
-#line 14877 "Dialogs.c"
+#line 14558 "Dialogs.c"
 		GtkComboBoxText* _tmp12_ = NULL;
 		GtkSpinButton* _tmp13_ = NULL;
 		struct tm _tmp14_ = {0};
 		gint _tmp15_ = 0;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->system;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->hour;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = *time;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_.tm_hour;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp15_);
-#line 14894 "Dialogs.c"
+#line 14575 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		struct tm _tmp16_ = {0};
@@ -14917,74 +14598,74 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 		struct tm _tmp23_ = {0};
 		gint _tmp24_ = 0;
 		GtkComboBoxText* _tmp25_ = NULL;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = *time;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_.tm_hour;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = _tmp17_ % 12;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = AMPM_hour;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp19_ == 0) {
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = 12;
-#line 14918 "Dialogs.c"
+#line 14599 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = AMPM_hour;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp20_;
-#line 14925 "Dialogs.c"
+#line 14606 "Dialogs.c"
 		}
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->hour;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp21_, (gdouble) _tmp18_);
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = *time;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = _tmp23_.tm_hour;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ >= 12) {
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
-#line 14939 "Dialogs.c"
+#line 14620 "Dialogs.c"
 		} else {
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
-#line 14943 "Dialogs.c"
+#line 14624 "Dialogs.c"
 		}
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = self->priv->system;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp22_);
-#line 14949 "Dialogs.c"
+#line 14630 "Dialogs.c"
 	}
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->minute;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = *time;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _tmp27_.tm_min;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp28_);
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->second;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = *time;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _tmp30_.tm_sec;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp29_, (gdouble) _tmp31_);
-#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = self->priv->system;
-#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp33_;
-#line 14973 "Dialogs.c"
+#line 14654 "Dialogs.c"
 }
 
 
@@ -15000,37 +14681,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 15019 "Dialogs.c"
+#line 14700 "Dialogs.c"
 }
 
 
@@ -15046,58 +14727,58 @@ static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialo
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
-#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->no_original_time;
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15043 "Dialogs.c"
+#line 14724 "Dialogs.c"
 	}
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_24_hr_format;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 15049 "Dialogs.c"
+#line 14730 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("%m/%d/%Y, %H:%M:%S");
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_;
-#line 15055 "Dialogs.c"
+#line 14736 "Dialogs.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("%m/%d/%Y, %I:%M:%S %p");
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp4_;
-#line 15062 "Dialogs.c"
+#line 14743 "Dialogs.c"
 	}
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->original_time_label;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Original: ");
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->original_time;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_time_local (_tmp7_, &_tmp8_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_time_format (&_tmp8_, _tmp1_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp5_, _tmp12_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp12_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 15086 "Dialogs.c"
+#line 14767 "Dialogs.c"
 }
 
 
@@ -15126,105 +14807,105 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	guint _tmp18_ = 0U;
 	guint _tmp19_ = 0U;
 	time_t _tmp20_ = 0;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
-#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&time, 0, sizeof (struct tm));
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->second;
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_sec = (gint) _tmp1_;
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->minute;
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_spin_button_get_value (_tmp2_);
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_min = (gint) _tmp3_;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->hour;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = gtk_spin_button_get_value (_tmp4_);
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hour = (gint) _tmp5_;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = hour;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == 12) {
-#line 15141 "Dialogs.c"
+#line 14822 "Dialogs.c"
 		GtkComboBoxText* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->system;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 15150 "Dialogs.c"
+#line 14831 "Dialogs.c"
 	} else {
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = FALSE;
-#line 15154 "Dialogs.c"
+#line 14835 "Dialogs.c"
 	}
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = 0;
-#line 15160 "Dialogs.c"
+#line 14841 "Dialogs.c"
 	} else {
 		gint _tmp11_ = 0;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = hour;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp11_;
-#line 15167 "Dialogs.c"
+#line 14848 "Dialogs.c"
 	}
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp6_;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = self->priv->system;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 12;
-#line 15179 "Dialogs.c"
+#line 14860 "Dialogs.c"
 	} else {
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 0;
-#line 15183 "Dialogs.c"
+#line 14864 "Dialogs.c"
 	}
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = time.tm_hour;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp15_ + _tmp12_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->calendar;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_);
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	year = _tmp17_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	month = _tmp18_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	day = _tmp19_;
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET;
-#line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mon = (gint) month;
-#line 1847 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mday = (gint) day;
-#line 1849 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_isdst = -1;
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = mktime (&time);
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_;
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15213 "Dialogs.c"
+#line 14894 "Dialogs.c"
 }
 
 
@@ -15235,17 +14916,17 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 	gboolean result = FALSE;
 	gboolean response = FALSE;
 	gint _tmp0_ = 0;
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	response = FALSE;
-#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 15234 "Dialogs.c"
+#line 14915 "Dialogs.c"
 		gboolean _tmp1_ = FALSE;
 		GtkRadioButton* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -15257,125 +14938,125 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 		GtkCheckButton* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->no_original_time;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp1_) {
-#line 15250 "Dialogs.c"
+#line 14931 "Dialogs.c"
 			time_t _tmp2_ = 0;
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = adjust_date_time_dialog_get_time (self);
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) _tmp2_;
-#line 15256 "Dialogs.c"
+#line 14937 "Dialogs.c"
 		} else {
 			time_t _tmp3_ = 0;
 			time_t _tmp4_ = 0;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = adjust_date_time_dialog_get_time (self);
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = self->priv->original_time;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
-#line 15266 "Dialogs.c"
+#line 14947 "Dialogs.c"
 		}
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->relativity_radio_button;
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = _tmp6_;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->relativity_radio_button;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 15282 "Dialogs.c"
+#line 14963 "Dialogs.c"
 			ConfigFacade* _tmp10_ = NULL;
 			ConfigFacade* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = config_facade_get_instance ();
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tmp10_;
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = _vala_keep_relativity;
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp11_);
-#line 15296 "Dialogs.c"
+#line 14977 "Dialogs.c"
 		}
-#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->modify_originals_check_button;
-#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = _tmp14_;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->modify_originals_check_button;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp17_) {
-#line 15312 "Dialogs.c"
+#line 14993 "Dialogs.c"
 			ConfigFacade* _tmp18_ = NULL;
 			ConfigFacade* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = config_facade_get_instance ();
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = _tmp18_;
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _vala_modify_originals;
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp19_);
-#line 15326 "Dialogs.c"
+#line 15007 "Dialogs.c"
 		}
-#line 1876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = TRUE;
-#line 15330 "Dialogs.c"
+#line 15011 "Dialogs.c"
 	} else {
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_time_shift = (gint64) 0;
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = TRUE;
-#line 1880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = FALSE;
-#line 15338 "Dialogs.c"
+#line 15019 "Dialogs.c"
 	}
-#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (time_shift) {
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*time_shift = _vala_time_shift;
-#line 15348 "Dialogs.c"
+#line 15029 "Dialogs.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (keep_relativity) {
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*keep_relativity = _vala_keep_relativity;
-#line 15354 "Dialogs.c"
+#line 15035 "Dialogs.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (modify_originals) {
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*modify_originals = _vala_modify_originals;
-#line 15360 "Dialogs.c"
+#line 15041 "Dialogs.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15364 "Dialogs.c"
+#line 15045 "Dialogs.c"
 }
 
 
@@ -15386,31 +15067,31 @@ static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDia
 	gdouble _tmp2_ = 0.0;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1888 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1888 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = button;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = button;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_spin_button_get_value (_tmp1_);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15399 "Dialogs.c"
+#line 15080 "Dialogs.c"
 }
 
 
@@ -15423,81 +15104,81 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
 	gint64 _tmp6_ = 0LL;
-#line 1896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = adjust_date_time_dialog_get_time (self);
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->original_time;
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_);
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->system;
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp3_;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = time_shift;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_ == ((gint64) 0)) {
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = TRUE;
-#line 15432 "Dialogs.c"
+#line 15113 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->no_original_time;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp7_;
-#line 15439 "Dialogs.c"
+#line 15120 "Dialogs.c"
 	}
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = TRUE;
-#line 15445 "Dialogs.c"
+#line 15126 "Dialogs.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		GtkRadioButton* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->batch_radio_button;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp10_) {
-#line 15456 "Dialogs.c"
+#line 15137 "Dialogs.c"
 			GtkRadioButton* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = self->priv->batch_radio_button;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = _tmp12_;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp13_;
-#line 15468 "Dialogs.c"
+#line 15149 "Dialogs.c"
 		} else {
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = FALSE;
-#line 15472 "Dialogs.c"
+#line 15153 "Dialogs.c"
 		}
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp8_;
-#line 15476 "Dialogs.c"
+#line 15157 "Dialogs.c"
 	}
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 15480 "Dialogs.c"
+#line 15161 "Dialogs.c"
 		GtkLabel* _tmp14_ = NULL;
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->notification;
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 15486 "Dialogs.c"
+#line 15167 "Dialogs.c"
 	} else {
 		gboolean forward = FALSE;
 		gint64 _tmp15_ = 0LL;
@@ -15534,108 +15215,108 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 		gchar* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
 		GtkLabel* _tmp45_ = NULL;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = time_shift;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		forward = _tmp15_ > ((gint64) 0);
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time_shift;
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = llabs (_tmp16_);
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp17_;
-#line 1910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = time_shift;
-#line 1910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		days = (gint) (_tmp18_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time_shift;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp19_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
-#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = time_shift;
-#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		hours = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
-#line 1913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = time_shift;
-#line 1913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = time_shift;
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		minutes = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = time_shift;
-#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		seconds = (gint) (_tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = forward;
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp25_) {
-#line 15561 "Dialogs.c"
+#line 15242 "Dialogs.c"
 			const gchar* _tmp26_ = NULL;
-#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = _ ("Exposure time will be shifted forward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp26_;
-#line 15567 "Dialogs.c"
+#line 15248 "Dialogs.c"
 		} else {
 			const gchar* _tmp27_ = NULL;
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = _ ("Exposure time will be shifted backward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp27_;
-#line 15574 "Dialogs.c"
+#line 15255 "Dialogs.c"
 		}
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup (_tmp24_);
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		shift_status = _tmp28_;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = self->priv->notification;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = shift_status;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = days;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = days;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = ngettext ("day", "days", (gulong) _tmp32_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = hours;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = hours;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = ngettext ("hour", "hours", (gulong) _tmp35_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = minutes;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = minutes;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = ngettext ("minute", "minutes", (gulong) _tmp38_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = seconds;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = seconds;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp42_ = ngettext ("second", "seconds", (gulong) _tmp41_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp43_ = g_strdup_printf (_tmp30_, _tmp31_, _tmp33_, _tmp34_, _tmp36_, _tmp37_, _tmp39_, _tmp40_, _tmp42_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp44_ = _tmp43_;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp29_, _tmp44_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp44_);
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp45_ = self->priv->notification;
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (shift_status);
-#line 15622 "Dialogs.c"
+#line 15303 "Dialogs.c"
 	}
 }
 
@@ -15650,39 +15331,39 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 	gint _tmp6_ = 0;
 	GtkComboBoxText* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->previous_time_system;
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->system;
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == _tmp2_) {
-#line 1932 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15649 "Dialogs.c"
+#line 15330 "Dialogs.c"
 	}
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = config_facade_get_instance ();
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->system;
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->system;
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
-#line 15669 "Dialogs.c"
+#line 15350 "Dialogs.c"
 		gint _tmp9_ = 0;
 		GtkSpinButton* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
@@ -15693,57 +15374,57 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		GtkSpinButton* _tmp17_ = NULL;
 		GtkSpinButton* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->hour;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_spin_button_get_value (_tmp10_);
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_ == 12.0) {
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = 0;
-#line 15688 "Dialogs.c"
+#line 15369 "Dialogs.c"
 		} else {
 			GtkSpinButton* _tmp12_ = NULL;
 			gdouble _tmp13_ = 0.0;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = self->priv->hour;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = gtk_spin_button_get_value (_tmp12_);
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = (gint) _tmp13_;
-#line 15698 "Dialogs.c"
+#line 15379 "Dialogs.c"
 		}
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp9_;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->previous_time_system;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 12;
-#line 15708 "Dialogs.c"
+#line 15389 "Dialogs.c"
 		} else {
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 0;
-#line 15712 "Dialogs.c"
+#line 15393 "Dialogs.c"
 		}
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp16_ + _tmp14_;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->hour;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23);
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, TRUE);
-#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->hour;
-#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time;
-#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
-#line 15730 "Dialogs.c"
+#line 15411 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		GtkSpinButton* _tmp20_ = NULL;
@@ -15752,92 +15433,92 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		GtkSpinButton* _tmp26_ = NULL;
-#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->hour;
-#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = gtk_spin_button_get_value (_tmp20_);
-#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = ((gint) _tmp21_) % 12;
-#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = self->priv->hour;
-#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12);
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, FALSE);
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = AMPM_hour;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ == 0) {
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = 12;
-#line 15757 "Dialogs.c"
+#line 15438 "Dialogs.c"
 		} else {
 			gint _tmp25_ = 0;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = AMPM_hour;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _tmp25_;
-#line 15764 "Dialogs.c"
+#line 15445 "Dialogs.c"
 		}
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = self->priv->hour;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
-#line 15770 "Dialogs.c"
+#line 15451 "Dialogs.c"
 	}
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 15774 "Dialogs.c"
+#line 15455 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) {
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
-#line 15785 "Dialogs.c"
+#line 15466 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) {
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
-#line 1641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->no_original_time = FALSE;
-#line 15794 "Dialogs.c"
+#line 15475 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_finalize (GObject* obj) {
 	AdjustDateTimeDialog * self;
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
-#line 1646 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1647 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hour);
-#line 1649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1652 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
-#line 15824 "Dialogs.c"
+#line 15505 "Dialogs.c"
 }
 
 
@@ -15869,31 +15550,31 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	GtkMessageDialog* _tmp34_ = NULL;
 	GtkMessageDialog* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (objects));
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (message != NULL);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = message;
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strconcat (_tmp0_, "\n", NULL);
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_message = _tmp1_;
-#line 15868 "Dialogs.c"
+#line 15549 "Dialogs.c"
 	{
 		gint i = 0;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 15873 "Dialogs.c"
+#line 15554 "Dialogs.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = TRUE;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 15880 "Dialogs.c"
+#line 15561 "Dialogs.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -15906,96 +15587,96 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
 				gchar* _tmp19_ = NULL;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp2_) {
-#line 15895 "Dialogs.c"
+#line 15576 "Dialogs.c"
 					gint _tmp3_ = 0;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp3_ = i;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp3_ + 1;
-#line 15901 "Dialogs.c"
+#line 15582 "Dialogs.c"
 				}
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp2_ = FALSE;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp5_ = i;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp5_ < MAX_OBJECTS_DISPLAYED) {
-#line 15909 "Dialogs.c"
+#line 15590 "Dialogs.c"
 					GeeArrayList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = objects;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = _tmp7_;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp9_ = i;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = _tmp8_ > _tmp9_;
-#line 15924 "Dialogs.c"
+#line 15605 "Dialogs.c"
 				} else {
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = FALSE;
-#line 15928 "Dialogs.c"
+#line 15609 "Dialogs.c"
 				}
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 15934 "Dialogs.c"
+#line 15615 "Dialogs.c"
 				}
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = dialog_message;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = objects;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = i;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = (DataObject*) _tmp13_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = data_object_to_string (_tmp14_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = _tmp15_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = g_strconcat ("\n", _tmp16_, NULL);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = _tmp17_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = g_strconcat (_tmp10_, _tmp18_, NULL);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (dialog_message);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				dialog_message = _tmp19_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp18_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp16_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp14_);
-#line 15966 "Dialogs.c"
+#line 15647 "Dialogs.c"
 			}
 		}
 	}
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = objects;
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remainder = _tmp22_ - MAX_OBJECTS_DISPLAYED;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = remainder;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 15982 "Dialogs.c"
+#line 15663 "Dialogs.c"
 		const gchar* _tmp24_ = NULL;
 		gint _tmp25_ = 0;
 		const gchar* _tmp26_ = NULL;
@@ -16003,57 +15684,57 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = dialog_message;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = remainder;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = remainder;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup_printf (_tmp26_, _tmp27_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = g_strconcat (_tmp24_, _tmp29_, NULL);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dialog_message);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_message = _tmp30_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp29_);
-#line 16010 "Dialogs.c"
+#line 15691 "Dialogs.c"
 	}
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = app_window_get_instance ();
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _tmp31_;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = dialog_message;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp33_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp34_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp32_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp35_;
-#line 1975 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = title;
-#line 1975 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp36_);
-#line 1977 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (dialog_message);
-#line 16040 "Dialogs.c"
+#line 15721 "Dialogs.c"
 }
 
 
@@ -16066,40 +15747,40 @@ TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const
 	HierarchicalTagIndex* _tmp4_ = NULL;
 	GeeCollection* _tmp5_ = NULL;
 	GeeCollection* _tmp6_ = NULL;
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = label;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = initial_text;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = hierarchical_tag_index_get_global_index ();
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = hierarchical_tag_index_get_all_tags (_tmp4_);
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TagsDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp6_, ",");
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp4_);
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16079 "Dialogs.c"
+#line 15760 "Dialogs.c"
 }
 
 
 static void tags_dialog_class_init (TagsDialogClass * klass) {
-#line 1981 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 16086 "Dialogs.c"
+#line 15767 "Dialogs.c"
 }
 
 
@@ -16125,28 +15806,28 @@ AddTagsDialog* add_tags_dialog_construct (GType object_type) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_dpgettext2 (NULL, "Dialog Title", RESOURCES_ADD_TAGS_TITLE);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title = _tmp1_;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _ ("Tags (separated by commas):");
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AddTagsDialog*) tags_dialog_construct (object_type, title, _tmp2_, NULL);
-#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title);
-#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16126 "Dialogs.c"
+#line 15807 "Dialogs.c"
 }
 
 
 AddTagsDialog* add_tags_dialog_new (void) {
-#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return add_tags_dialog_construct (TYPE_ADD_TAGS_DIALOG);
-#line 16133 "Dialogs.c"
+#line 15814 "Dialogs.c"
 }
 
 
@@ -16166,70 +15847,70 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	gint _tmp9__length1 = 0;
 	gchar** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADD_TAGS_DIALOG (self), NULL);
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 16163 "Dialogs.c"
+#line 15844 "Dialogs.c"
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = NULL;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2__length1 = 0;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (result_length1) {
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*result_length1 = _tmp2__length1;
-#line 16174 "Dialogs.c"
+#line 15855 "Dialogs.c"
 		}
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp2_;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16182 "Dialogs.c"
+#line 15863 "Dialogs.c"
 	}
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ",", 0);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__length1 = _vala_array_length (_tmp4_);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = tag_prep_tag_names (_tmp6_, _vala_array_length (_tmp4_), &_tmp7_);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = _tmp7_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10__length1 = _tmp9__length1;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (result_length1) {
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*result_length1 = _tmp10__length1;
-#line 16208 "Dialogs.c"
+#line 15889 "Dialogs.c"
 	}
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp10_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16216 "Dialogs.c"
+#line 15897 "Dialogs.c"
 }
 
 
@@ -16252,64 +15933,64 @@ static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator
 	gint _names_size_ = 0;
 	gchar** _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
-#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_DIALOG, AddTagsDialog);
-#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16253 "Dialogs.c"
+#line 15934 "Dialogs.c"
 	}
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = _vala_array_length (_tmp3_);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = tag_prep_tag_names (_tmp5_, _vala_array_length (_tmp3_), &_tmp6_);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _tmp6_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = _tmp8_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names_length1 = _tmp8__length1;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_names_size_ = names_length1;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = names;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = names_length1;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp9__length1 > 0;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16287 "Dialogs.c"
+#line 15968 "Dialogs.c"
 }
 
 
 static void add_tags_dialog_class_init (AddTagsDialogClass * klass) {
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	add_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = add_tags_dialog_real_on_modify_validate;
-#line 16296 "Dialogs.c"
+#line 15977 "Dialogs.c"
 }
 
 
@@ -16335,30 +16016,30 @@ ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource*
 	MediaSource* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Tags (separated by commas):");
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = modify_tags_dialog_get_initial_text (_tmp1_);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _tmp0_, _tmp3_);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp3_);
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16338 "Dialogs.c"
+#line 16019 "Dialogs.c"
 }
 
 
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source) {
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return modify_tags_dialog_construct (TYPE_MODIFY_TAGS_DIALOG, source);
-#line 16345 "Dialogs.c"
+#line 16026 "Dialogs.c"
 }
 
 
@@ -16375,52 +16056,52 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	GeeSortedSet* tag_basenames = NULL;
 	GeeTreeSet* _tmp6_ = NULL;
 	gchar* text = NULL;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = tag_global;
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = tag_source_collection_fetch_for_source (_tmp0_, _tmp1_);
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	source_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = source_tags;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (source_tags);
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16382 "Dialogs.c"
+#line 16063 "Dialogs.c"
 	}
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = source_tags;
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = tag_get_terminal_tags (_tmp4_);
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	terminal_tags = _tmp5_;
-#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 16394 "Dialogs.c"
+#line 16075 "Dialogs.c"
 	{
 		GeeIterator* _tag_it = NULL;
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = terminal_tags;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tag_it = _tmp8_;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16407 "Dialogs.c"
+#line 16088 "Dialogs.c"
 			GeeIterator* _tmp9_ = NULL;
 			gboolean _tmp10_ = FALSE;
 			Tag* tag = NULL;
@@ -16432,64 +16113,64 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tag_it;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = gee_iterator_next (_tmp9_);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp10_) {
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16427 "Dialogs.c"
+#line 16108 "Dialogs.c"
 			}
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tag_it;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gee_iterator_get (_tmp11_);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			tag = (Tag*) _tmp12_;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = tag_basenames;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = tag;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = tag_get_path (_tmp14_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = _tmp15_;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = hierarchical_tag_utilities_get_basename (_tmp16_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp17_;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp18_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp16_);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (tag);
-#line 16455 "Dialogs.c"
+#line 16136 "Dialogs.c"
 		}
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tag_it);
-#line 16459 "Dialogs.c"
+#line 16140 "Dialogs.c"
 	}
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 16463 "Dialogs.c"
+#line 16144 "Dialogs.c"
 	{
 		GeeIterator* _name_it = NULL;
 		GeeSortedSet* _tmp19_ = NULL;
 		GeeIterator* _tmp20_ = NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = tag_basenames;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_name_it = _tmp20_;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16476 "Dialogs.c"
+#line 16157 "Dialogs.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			gchar* name = NULL;
@@ -16499,77 +16180,77 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			const gchar* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _name_it;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp22_) {
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16494 "Dialogs.c"
+#line 16175 "Dialogs.c"
 			}
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _name_it;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = (gchar*) _tmp24_;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = text;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp25_ == NULL) {
-#line 16506 "Dialogs.c"
+#line 16187 "Dialogs.c"
 				gchar* _tmp26_ = NULL;
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = g_strdup ("");
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp26_;
-#line 16514 "Dialogs.c"
+#line 16195 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = text;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strconcat (_tmp27_, ", ", NULL);
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 16526 "Dialogs.c"
+#line 16207 "Dialogs.c"
 			}
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = text;
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = name;
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp31_;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (name);
-#line 16540 "Dialogs.c"
+#line 16221 "Dialogs.c"
 		}
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_name_it);
-#line 16544 "Dialogs.c"
+#line 16225 "Dialogs.c"
 	}
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (tag_basenames);
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (terminal_tags);
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (source_tags);
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16556 "Dialogs.c"
+#line 16237 "Dialogs.c"
 }
 
 
@@ -16602,140 +16283,140 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	gchar** _tmp16_ = NULL;
 	gchar** _tmp17_ = NULL;
 	gint _tmp17__length1 = 0;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MODIFY_TAGS_DIALOG (self), NULL);
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16605 "Dialogs.c"
+#line 16286 "Dialogs.c"
 	}
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_tags = _tmp2_;
-#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = is_string_empty (_tmp3_);
-#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = new_tags;
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16623 "Dialogs.c"
+#line 16304 "Dialogs.c"
 	}
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = text;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ",", 0);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = tag_prep_tag_names (_tmp8_, _vala_array_length (_tmp6_), &_tmp9_);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11__length1 = _tmp9_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp11_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp11__length1;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = hierarchical_tag_index_get_global_index ();
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = tag_names;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14__length1 = tag_names_length1;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = hierarchical_tag_index_get_paths_for_names_array (_tmp13_, _tmp14_, _tmp14__length1, &_tmp15_);
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp16_;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp15_;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp13_);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = tag_names;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17__length1 = tag_names_length1;
-#line 16671 "Dialogs.c"
+#line 16352 "Dialogs.c"
 	{
 		gchar** name_collection = NULL;
 		gint name_collection_length1 = 0;
 		gint _name_collection_size_ = 0;
 		gint name_it = 0;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection = _tmp17_;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection_length1 = _tmp17__length1;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (name_it = 0; name_it < _tmp17__length1; name_it = name_it + 1) {
-#line 16683 "Dialogs.c"
+#line 16364 "Dialogs.c"
 			gchar* _tmp18_ = NULL;
 			gchar* name = NULL;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup (name_collection[name_it]);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = _tmp18_;
-#line 16690 "Dialogs.c"
+#line 16371 "Dialogs.c"
 			{
 				GeeArrayList* _tmp19_ = NULL;
 				const gchar* _tmp20_ = NULL;
 				Tag* _tmp21_ = NULL;
 				Tag* _tmp22_ = NULL;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = new_tags;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp20_ = name;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = tag_for_path (_tmp20_);
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = _tmp21_;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp22_);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (name);
-#line 16710 "Dialogs.c"
+#line 16391 "Dialogs.c"
 			}
 		}
 	}
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = new_tags;
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16722 "Dialogs.c"
+#line 16403 "Dialogs.c"
 }
 
 
@@ -16744,28 +16425,28 @@ static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMedia
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_DIALOG, ModifyTagsDialog);
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = !_tmp1_;
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16743 "Dialogs.c"
+#line 16424 "Dialogs.c"
 }
 
 
 static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) {
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	modify_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = modify_tags_dialog_real_on_modify_validate;
-#line 16752 "Dialogs.c"
+#line 16433 "Dialogs.c"
 }
 
 
@@ -16786,31 +16467,31 @@ GType modify_tags_dialog_get_type (void) {
 
 
 gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
-#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
-#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
-#line 16777 "Dialogs.c"
+#line 16458 "Dialogs.c"
 }
 
 
 void welcome_service_entry_execute (WelcomeServiceEntry* self) {
-#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
-#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
-#line 16786 "Dialogs.c"
+#line 16467 "Dialogs.c"
 }
 
 
 static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	static gboolean initialized = FALSE;
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!initialized) {
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		initialized = TRUE;
-#line 16797 "Dialogs.c"
+#line 16478 "Dialogs.c"
 	}
 }
 
@@ -16922,255 +16603,255 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 	GtkBox* _tmp90_ = NULL;
 	GtkWidget* _tmp91_ = NULL;
 	SpitDataImportsWelcomeImportMetaHost* _tmp92_ = NULL;
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (WelcomeDialog*) g_object_new (object_type, NULL);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = spit_data_imports_welcome_import_meta_host_new (self);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_meta_host);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_meta_host = _tmp0_;
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_dialog_is_system_pictures_import_possible ();
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	show_system_pictures_import = _tmp1_;
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok_button = _tmp3_;
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("Welcome!");
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkLabel*) gtk_label_new ("");
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text = _tmp6_;
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = primary_text;
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Welcome to Shotwell!");
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _tmp8_);
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp7_, _tmp10_);
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = primary_text;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp11_, 0.0f);
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = primary_text;
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp12_, 0.5f);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = (GtkLabel*) gtk_label_new ("");
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp13_);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->secondary_text = _tmp13_;
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = self->priv->secondary_text;
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = _ ("To get started, import photos in any of these ways:");
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _tmp15_);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = _tmp16_;
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp14_, _tmp17_);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp17_);
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->secondary_text;
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp18_, 0.0f);
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->secondary_text;
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp19_, 0.5f);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp20_);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image = _tmp20_;
-#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp21_);
-#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header_text = _tmp21_;
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = header_text;
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = primary_text;
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
-#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = header_text;
-#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = self->priv->secondary_text;
-#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp26_);
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header_content = _tmp26_;
-#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = header_content;
-#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = image;
-#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = header_content;
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = header_text;
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = (GtkLabel*) gtk_label_new ("");
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp31_);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	instructions = _tmp31_;
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = g_strdup ("   ");
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	indent_prefix = _tmp32_;
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp34_ == GTK_TEXT_DIR_RTL) {
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = "◂";
-#line 17053 "Dialogs.c"
+#line 16734 "Dialogs.c"
 	} else {
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = "▸";
-#line 17057 "Dialogs.c"
+#line 16738 "Dialogs.c"
 	}
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = g_strdup (_tmp33_);
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	arrow_glyph = _tmp35_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = instructions;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = indent_prefix;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = g_strconcat (_tmp37_, "&#8226; %s\n", NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = _tmp38_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = indent_prefix;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = g_strconcat (_tmp40_, "&#8226; %s\n", NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = _tmp41_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = g_strconcat (_tmp39_, _tmp42_, NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = _tmp43_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = indent_prefix;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = g_strconcat (_tmp45_, "&#8226; %s", NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = _tmp46_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = g_strconcat (_tmp44_, _tmp47_, NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = _tmp48_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _ ("Choose <span weight=\"bold\">File %s Import From Folder</span>");
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = arrow_glyph;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = g_strdup_printf (_tmp50_, _tmp51_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = _tmp52_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = _ ("Drag and drop photos onto the Shotwell window");
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _ ("Connect a camera to your computer and import");
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = g_strdup_printf (_tmp49_, _tmp53_, _tmp54_, _tmp55_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp57_ = _tmp56_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp36_, _tmp57_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp57_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp53_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp49_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp47_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp44_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp42_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp39_);
-#line 2134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = instructions;
-#line 2134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp58_, 0.0f);
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = instructions;
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp59_, 0.5f);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp60_);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_action_checkbox_packer = _tmp60_;
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp61_);
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_action_checkbox_packer = _tmp61_;
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = self->priv->import_action_checkbox_packer;
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = self->priv->external_import_action_checkbox_packer;
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = show_system_pictures_import;
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp64_) {
-#line 17157 "Dialogs.c"
+#line 16838 "Dialogs.c"
 		const gchar* _tmp65_ = NULL;
 		GFile* _tmp66_ = NULL;
 		GFile* _tmp67_ = NULL;
@@ -17182,170 +16863,170 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 		GtkBox* _tmp73_ = NULL;
 		GtkCheckButton* _tmp74_ = NULL;
 		GtkCheckButton* _tmp75_ = NULL;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp65_ = _ ("_Import photos from your %s folder");
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp66_ = app_dirs_get_import_dir ();
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp67_ = _tmp66_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp68_ = get_display_pathname (_tmp67_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = _tmp68_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = g_strdup_printf (_tmp65_, _tmp69_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = _tmp70_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp72_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp71_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp72_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->system_pictures_import_check = _tmp72_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp71_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp69_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp67_);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp73_ = self->priv->import_action_checkbox_packer;
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp74_ = self->priv->system_pictures_import_check;
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp75_ = self->priv->system_pictures_import_check;
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 17207 "Dialogs.c"
+#line 16888 "Dialogs.c"
 	}
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = _ ("You can also import photos in any of these ways:");
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = (GtkLabel*) gtk_label_new (_tmp76_);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp77_);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->instruction_header = _tmp77_;
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = self->priv->instruction_header;
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp78_, 0.0f);
-#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = self->priv->instruction_header;
-#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp79_, 0.5f);
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = self->priv->instruction_header;
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), 20);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp81_);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	content = _tmp81_;
-#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = header_content;
-#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp83_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp83_);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_content = _tmp83_;
-#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = self->priv->import_content;
-#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget));
-#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp85_ = instructions;
-#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = _ ("_Don’t show this message again");
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp86_);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp87_);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->hide_button = _tmp87_;
-#line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = self->priv->hide_button;
-#line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = self->priv->hide_button;
-#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
-#line 2165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 0);
-#line 2171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp90_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = ok_button;
-#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (_tmp91_);
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp92_ = self->priv->import_meta_host;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spit_data_imports_welcome_import_meta_host_start (_tmp92_);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (content);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (arrow_glyph);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (indent_prefix);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (instructions);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_content);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_text);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (ok_button);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 17325 "Dialogs.c"
+#line 17006 "Dialogs.c"
 }
 
 
 WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
-#line 17332 "Dialogs.c"
+#line 17013 "Dialogs.c"
 }
 
 
@@ -17354,101 +17035,101 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
 	gboolean _tmp1_ = FALSE;
 	GtkCheckButton** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->external_import_checks;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2__length1 = self->priv->external_import_checks_length1;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2__length1 > 0) {
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = TRUE;
-#line 17351 "Dialogs.c"
+#line 17032 "Dialogs.c"
 	} else {
 		GtkCheckButton* _tmp3_ = NULL;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->system_pictures_import_check;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 17358 "Dialogs.c"
+#line 17039 "Dialogs.c"
 	}
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 17362 "Dialogs.c"
+#line 17043 "Dialogs.c"
 		gboolean _tmp4_ = FALSE;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->import_content_already_installed;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == FALSE;
-#line 17368 "Dialogs.c"
+#line 17049 "Dialogs.c"
 	} else {
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 17372 "Dialogs.c"
+#line 17053 "Dialogs.c"
 	}
-#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 17376 "Dialogs.c"
+#line 17057 "Dialogs.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkBox* _tmp6_ = NULL;
 		GtkBox* _tmp7_ = NULL;
 		GtkBox* _tmp8_ = NULL;
 		GtkLabel* _tmp9_ = NULL;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->secondary_text;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp5_, "");
-#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->import_content;
-#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->import_action_checkbox_packer;
-#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->import_content;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->instruction_header;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2191 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->import_content_already_installed = TRUE;
-#line 17400 "Dialogs.c"
+#line 17081 "Dialogs.c"
 	}
 }
 
 
 static void _vala_array_add109 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17412 "Dialogs.c"
+#line 17093 "Dialogs.c"
 	}
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17418 "Dialogs.c"
+#line 17099 "Dialogs.c"
 }
 
 
 static void _vala_array_add110 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value) {
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
-#line 17429 "Dialogs.c"
+#line 17110 "Dialogs.c"
 	}
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17435 "Dialogs.c"
+#line 17116 "Dialogs.c"
 }
 
 
@@ -17475,79 +17156,79 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
 	gint _tmp16__length1 = 0;
 	GtkCheckButton* _tmp17_ = NULL;
 	GtkBox* _tmp18_ = NULL;
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = entry;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2196: %s", _tmp4_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2186: %s", _tmp4_);
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp2_);
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->external_import_entries;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = self->priv->external_import_entries_length1;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = entry;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_array_add109 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import photos from your %s library");
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = entry;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = welcome_service_entry_get_service_name (_tmp9_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = g_strdup_printf (_tmp8_, _tmp11_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp13_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp14_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = _tmp14_;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp13_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp11_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	entry_check = _tmp15_;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->external_import_checks;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16__length1 = self->priv->external_import_checks_length1;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = _g_object_ref0 (entry_check);
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_array_add110 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp17_);
-#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->external_import_action_checkbox_packer;
-#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
-#line 2203 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (entry_check);
-#line 17534 "Dialogs.c"
+#line 17215 "Dialogs.c"
 }
 
 
@@ -17558,66 +17239,66 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
      */
 static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
 	gint _tmp0_ = 0;
-#line 2211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = resp;
-#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->ok_clicked = TRUE;
-#line 17553 "Dialogs.c"
+#line 17234 "Dialogs.c"
 	}
-#line 2215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2216 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main_quit ();
-#line 17559 "Dialogs.c"
+#line 17240 "Dialogs.c"
 }
 
 
 static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
-#line 17566 "Dialogs.c"
+#line 17247 "Dialogs.c"
 }
 
 
 static void _vala_array_add111 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17577 "Dialogs.c"
+#line 17258 "Dialogs.c"
 	}
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17583 "Dialogs.c"
+#line 17264 "Dialogs.c"
 }
 
 
 static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int length) {
 	WelcomeServiceEntry** result;
 	int i;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = g_new0 (WelcomeServiceEntry*, length + 1);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	for (i = 0; i < length; i++) {
-#line 17594 "Dialogs.c"
+#line 17275 "Dialogs.c"
 		WelcomeServiceEntry* _tmp0_ = NULL;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result[i] = _tmp0_;
-#line 17600 "Dialogs.c"
+#line 17281 "Dialogs.c"
 	}
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17604 "Dialogs.c"
+#line 17285 "Dialogs.c"
 }
 
 
@@ -17641,62 +17322,62 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	gint _tmp20__length1 = 0;
 	gboolean _tmp21_ = FALSE;
 	GtkCheckButton* _tmp22_ = NULL;
-#line 2219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
-#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self, 0);
-#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main ();
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("response", gtk_dialog_get_type (), &_tmp0_, NULL, FALSE);
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self);
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->ok_clicked;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok = _tmp1_;
-#line 2236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	show_dialog = TRUE;
-#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = ok;
-#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 17652 "Dialogs.c"
+#line 17333 "Dialogs.c"
 		GtkCheckButton* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->hide_button;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		show_dialog = !_tmp4_;
-#line 17661 "Dialogs.c"
+#line 17342 "Dialogs.c"
 	}
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp5_;
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result__length1 = 0;
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	__result__size_ = _result__length1;
-#line 17671 "Dialogs.c"
+#line 17352 "Dialogs.c"
 	{
 		gint i = 0;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 17676 "Dialogs.c"
+#line 17357 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 17683 "Dialogs.c"
+#line 17364 "Dialogs.c"
 				gint _tmp8_ = 0;
 				WelcomeServiceEntry** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
@@ -17705,43 +17386,43 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 				gint _tmp11_ = 0;
 				GtkCheckButton* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 17694 "Dialogs.c"
+#line 17375 "Dialogs.c"
 					gint _tmp7_ = 0;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = i;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp7_ + 1;
-#line 17700 "Dialogs.c"
+#line 17381 "Dialogs.c"
 				}
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = i;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = self->priv->external_import_entries;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9__length1 = self->priv->external_import_entries_length1;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp8_ < _tmp9__length1)) {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 17714 "Dialogs.c"
+#line 17395 "Dialogs.c"
 				}
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = self->priv->external_import_checks;
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10__length1 = self->priv->external_import_checks_length1;
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = i;
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_ == TRUE) {
-#line 17728 "Dialogs.c"
+#line 17409 "Dialogs.c"
 					WelcomeServiceEntry** _tmp14_ = NULL;
 					gint _tmp14__length1 = 0;
 					WelcomeServiceEntry** _tmp15_ = NULL;
@@ -17749,93 +17430,93 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 					gint _tmp16_ = 0;
 					WelcomeServiceEntry* _tmp17_ = NULL;
 					WelcomeServiceEntry* _tmp18_ = NULL;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = _result_;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14__length1 = _result__length1;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15_ = self->priv->external_import_entries;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15__length1 = self->priv->external_import_entries_length1;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp16_ = i;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp17_ = _tmp15_[_tmp16_];
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_vala_array_add111 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 17752 "Dialogs.c"
+#line 17433 "Dialogs.c"
 				}
 			}
 		}
 	}
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _result_;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19__length1 = _result__length1;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup29 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20__length1 = _tmp19__length1;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = _tmp20_;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries_length1 = _tmp20__length1;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->system_pictures_import_check;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp22_ != NULL) {
-#line 17775 "Dialogs.c"
+#line 17456 "Dialogs.c"
 		GtkCheckButton* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = self->priv->system_pictures_import_check;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp24_;
-#line 17784 "Dialogs.c"
+#line 17465 "Dialogs.c"
 	} else {
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = FALSE;
-#line 17788 "Dialogs.c"
+#line 17469 "Dialogs.c"
 	}
-#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_do_system_pictures_import = _tmp21_;
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = show_dialog;
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries) {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries = _vala_selected_import_entries;
-#line 17802 "Dialogs.c"
+#line 17483 "Dialogs.c"
 	} else {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 17806 "Dialogs.c"
+#line 17487 "Dialogs.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries_length1) {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries_length1 = _vala_selected_import_entries_length1;
-#line 17812 "Dialogs.c"
+#line 17493 "Dialogs.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (do_system_pictures_import) {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*do_system_pictures_import = _vala_do_system_pictures_import;
-#line 17818 "Dialogs.c"
+#line 17499 "Dialogs.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17822 "Dialogs.c"
+#line 17503 "Dialogs.c"
 }
 
 
@@ -17848,37 +17529,37 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 	GFile* _tmp3_ = NULL;
 	GFileType _tmp4_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	system_pictures = _tmp0_;
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = system_pictures;
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_file_query_exists (_tmp1_, NULL);
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17851 "Dialogs.c"
+#line 17532 "Dialogs.c"
 	}
-#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = system_pictures;
-#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) {
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17865 "Dialogs.c"
+#line 17546 "Dialogs.c"
 	}
 	{
 		GFileEnumerator* syspics_child_enum = NULL;
@@ -17890,152 +17571,152 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		GFileInfo* _tmp10_ = NULL;
 		GFileInfo* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = system_pictures;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		syspics_child_enum = _tmp6_;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17885 "Dialogs.c"
+#line 17566 "Dialogs.c"
 			goto __catch423_g_error;
 		}
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp9_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
-#line 17898 "Dialogs.c"
+#line 17579 "Dialogs.c"
 			goto __catch423_g_error;
 		}
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp7_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = NULL;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = _tmp10_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp11_ != NULL;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp12_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (syspics_child_enum);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17921 "Dialogs.c"
+#line 17602 "Dialogs.c"
 	}
 	goto __finally423;
 	__catch423_g_error:
 	{
 		GError* e = NULL;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17939 "Dialogs.c"
+#line 17620 "Dialogs.c"
 	}
 	__finally423:
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_clear_error (&_inner_error_);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return FALSE;
-#line 17950 "Dialogs.c"
+#line 17631 "Dialogs.c"
 }
 
 
 static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
-#line 17961 "Dialogs.c"
+#line 17642 "Dialogs.c"
 }
 
 
 static void welcome_dialog_instance_init (WelcomeDialog * self) {
 	GtkCheckButton** _tmp0_ = NULL;
 	WelcomeServiceEntry** _tmp1_ = NULL;
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = WELCOME_DIALOG_GET_PRIVATE (self);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system_pictures_import_check = NULL;
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_new0 (GtkCheckButton*, 0 + 1);
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = _tmp0_;
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks_length1 = 0;
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_checks_size_ = self->priv->external_import_checks_length1;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = _tmp1_;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries_length1 = 0;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_entries_size_ = self->priv->external_import_entries_length1;
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_content_already_installed = FALSE;
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->ok_clicked = FALSE;
-#line 17992 "Dialogs.c"
+#line 17673 "Dialogs.c"
 }
 
 
 static void welcome_dialog_finalize (GObject* obj) {
 	WelcomeDialog * self;
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
-#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = (_vala_array_free (self->priv->external_import_checks, self->priv->external_import_checks_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = (_vala_array_free (self->priv->external_import_entries, self->priv->external_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_meta_host);
 #line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->import_meta_host);
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj);
-#line 18022 "Dialogs.c"
+#line 17703 "Dialogs.c"
 }
 
 
@@ -18054,92 +17735,92 @@ GType welcome_dialog_get_type (void) {
 static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_delete ((PreferencesDialog*) self);
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18043 "Dialogs.c"
+#line 17724 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_close ((PreferencesDialog*) self);
-#line 18050 "Dialogs.c"
+#line 17731 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_value_changed ((PreferencesDialog*) self);
-#line 18057 "Dialogs.c"
+#line 17738 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
-#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18066 "Dialogs.c"
+#line 17747 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18075 "Dialogs.c"
+#line 17756 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
-#line 18082 "Dialogs.c"
+#line 17763 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
-#line 18089 "Dialogs.c"
+#line 17770 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
-#line 18096 "Dialogs.c"
+#line 17777 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
-#line 18103 "Dialogs.c"
+#line 17784 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
-#line 18110 "Dialogs.c"
+#line 17791 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
-#line 18117 "Dialogs.c"
+#line 17798 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_map_event ((PreferencesDialog*) self);
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18126 "Dialogs.c"
+#line 17807 "Dialogs.c"
 }
 
 
@@ -18259,196 +17940,196 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	RawDeveloper _tmp120_ = 0;
 	GtkComboBoxText* _tmp121_ = NULL;
 	GtkDialog* _tmp122_ = NULL;
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialog*) g_type_create_instance (object_type);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp0_;
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->builder;
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_builder_get_object (_tmp1_, "preferences_dialog");
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp2_) : NULL);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dialog = _tmp3_;
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_settings_get_default ();
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = use_header;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp5_) {
-#line 18272 "Dialogs.c"
+#line 17953 "Dialogs.c"
 		GtkWidget* null_titlebar = NULL;
 		GtkDialog* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
-#line 2313 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		null_titlebar = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->dialog;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = null_titlebar;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_titlebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (null_titlebar);
-#line 18286 "Dialogs.c"
+#line 17967 "Dialogs.c"
 	}
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->dialog;
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = app_window_get_instance ();
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->dialog;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = app_window_get_instance ();
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = self->priv->dialog;
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self);
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->dialog;
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp16_, "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->builder;
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_builder_get_object (_tmp17_, "bg_color_adjustment");
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_adjustment_get_type ()) ? ((GtkAdjustment*) _tmp18_) : NULL);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->bg_color_adjustment = _tmp19_;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->bg_color_adjustment;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->priv->bg_color_adjustment;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = gtk_adjustment_get_upper (_tmp21_);
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = config_facade_get_instance ();
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = _tmp23_;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_get_bg_color (_tmp24_, &_tmp25_);
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = _tmp25_.red;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_adjustment_set_value (_tmp20_, _tmp22_ - (_tmp26_ * 65535.0));
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp24_);
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = self->priv->bg_color_adjustment;
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp27_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self);
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = self->priv->builder;
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = gtk_builder_get_object (_tmp28_, "bg_color_slider");
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp29_) : NULL);
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->bg_color_slider = _tmp30_;
-#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = self->priv->bg_color_slider;
-#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self);
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = self->priv->builder;
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = gtk_builder_get_object (_tmp32_, "library_dir_button");
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, gtk_file_chooser_button_get_type ()) ? ((GtkFileChooserButton*) _tmp33_) : NULL);
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->library_dir_button = _tmp34_;
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = self->priv->builder;
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = gtk_builder_get_object (_tmp35_, "external_photo_editor_combo");
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp36_) : NULL);
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->photo_editor_combo = _tmp37_;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = self->priv->builder;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = gtk_builder_get_object (_tmp38_, "external_raw_editor_combo");
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp39_) : NULL);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->raw_editor_combo = _tmp40_;
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = self->priv->builder;
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = gtk_builder_get_object (_tmp41_, "pattern_help");
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp42_) : NULL);
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pattern_help = _tmp43_;
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = resources_get_help_path ();
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	help_path = _tmp44_;
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = help_path;
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp45_ == NULL) {
-#line 18410 "Dialogs.c"
+#line 18091 "Dialogs.c"
 		GtkLabel* _tmp46_ = NULL;
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		gchar* _tmp51_ = NULL;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp46_ = pattern_help;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp47_ = _ ("(Help)");
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _tmp47_, NULL);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp49_ = _tmp48_;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp50_ = g_strconcat (_tmp49_, "</a>", NULL);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = _tmp50_;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp46_, _tmp51_);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp51_);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp49_);
-#line 18435 "Dialogs.c"
+#line 18116 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp52_ = NULL;
 		const gchar* _tmp53_ = NULL;
@@ -18457,260 +18138,260 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 		gchar* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		GtkLabel* _tmp58_ = NULL;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp52_ = pattern_help;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = _ ("(Help)");
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp54_ = g_strconcat ("<a href=\"dummy:\">", _tmp53_, NULL);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp55_ = _tmp54_;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp56_ = g_strconcat (_tmp55_, "</a>", NULL);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = _tmp56_;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp52_, _tmp57_);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp57_);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp55_);
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp58_ = pattern_help;
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect (_tmp58_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self);
-#line 18466 "Dialogs.c"
+#line 18147 "Dialogs.c"
 	}
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = self->priv->builder;
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = gtk_builder_get_object (_tmp59_, "dir choser");
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp60_) : NULL);
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_combo = _tmp61_;
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = self->priv->builder;
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = gtk_builder_get_object (_tmp62_, "dir_pattern_entry");
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp63_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp63_) : NULL);
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_entry = _tmp64_;
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->builder;
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = gtk_builder_get_object (_tmp65_, "dynamic example");
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp66_) : NULL);
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_example = _tmp67_;
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = _ ("Year%sMonth%sDay");
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = g_strdup_printf (_tmp68_, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = _tmp69_;
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp70_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp70_);
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = _ ("Year%sMonth");
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = g_strdup_printf (_tmp71_, G_DIR_SEPARATOR_S);
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = _tmp72_;
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp73_, "%Y" G_DIR_SEPARATOR_S "%m");
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp73_);
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = _ ("Year%sMonth-Day");
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = g_strdup_printf (_tmp74_, G_DIR_SEPARATOR_S);
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = _tmp75_;
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp76_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp76_);
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = _ ("Year-Month-Day");
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp77_, "%Y-%m-%d");
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = _ ("Custom");
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp78_, NULL);
-#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = self->priv->dir_pattern_combo;
-#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = self->priv->dir_pattern_entry;
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = self->priv->builder;
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = gtk_builder_get_object (_tmp81_, "dir_structure_label");
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp83_ = self->priv->dir_pattern_combo;
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp82_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget));
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = self->priv->builder;
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp85_ = gtk_builder_get_object (_tmp84_, "lowercase");
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp85_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp85_) : NULL);
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lowercase = _tmp86_;
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = self->priv->lowercase;
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = self->priv->builder;
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = gtk_builder_get_object (_tmp88_, "preferences-notebook");
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp90_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp89_, gtk_notebook_get_type ()) ? ((GtkNotebook*) _tmp89_) : NULL);
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	notebook = _tmp90_;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = gtk_notebook_get_nth_page (notebook, 2);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp92_ = self->priv->plugins_mediator;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp93_ = plugins_manifest_widget_mediator_get_widget (_tmp92_);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp94_ = _tmp93_;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp91_) : NULL, _tmp94_);
-#line 2375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (self);
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp95_ = self->priv->photo_editor_combo;
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp95_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp96_ = self->priv->raw_editor_combo;
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp96_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp97_ = self->priv->builder;
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp98_ = gtk_builder_get_object (_tmp97_, "autoimport");
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp99_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp98_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp98_) : NULL);
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	auto_import_button = _tmp99_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp100_ = config_facade_get_instance ();
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp101_ = _tmp100_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp102_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp102_);
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp101_);
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp103_ = self->priv->builder;
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp104_ = gtk_builder_get_object (_tmp103_, "write_metadata");
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp105_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp104_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp104_) : NULL);
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	commit_metadata_button = _tmp105_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp106_ = config_facade_get_instance ();
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp107_ = _tmp106_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp108_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp108_);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp107_);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp109_ = self->priv->builder;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp110_ = gtk_builder_get_object (_tmp109_, "default_raw_developer");
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp111_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp110_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp110_) : NULL);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->default_raw_developer_combo = _tmp111_;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp112_ = self->priv->default_raw_developer_combo;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp113_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp114_ = _tmp113_;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp112_, _tmp114_);
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp114_);
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp115_ = self->priv->default_raw_developer_combo;
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp116_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp117_ = _tmp116_;
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp115_, _tmp117_);
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp117_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = config_facade_get_instance ();
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp119_ = _tmp118_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_raw_developer_combo (self, _tmp120_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp119_);
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = self->priv->default_raw_developer_combo;
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = self->priv->dialog;
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata_button);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (auto_import_button);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (notebook);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (help_path);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pattern_help);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 18690 "Dialogs.c"
+#line 18371 "Dialogs.c"
 }
 
 
 static PreferencesDialog* preferences_dialog_new (void) {
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
-#line 18697 "Dialogs.c"
+#line 18378 "Dialogs.c"
 }
 
 
@@ -18741,111 +18422,111 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
 	ConfigFacade* _tmp21_ = NULL;
 	ConfigFacade* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->photo_editor_combo;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_file_format_get_editable_mime_types (&_tmp1_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3__length1 = _tmp1_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp0_, _tmp3_, _tmp1_, _tmp7_, &_tmp8_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_photo_apps = _tmp8_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp7_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->raw_editor_combo;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = photo_file_format_get_mime_types (PHOTO_FILE_FORMAT_RAW, &_tmp10_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12__length1 = _tmp10_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp9_, _tmp12_, _tmp10_, _tmp16_, &_tmp17_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_raw_apps = _tmp17_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->dir_pattern_combo;
-#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->dir_pattern_entry;
-#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_setup_dir_pattern (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), _tmp19_);
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lowercase;
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = config_facade_get_instance ();
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp22_);
-#line 18804 "Dialogs.c"
+#line 18485 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (ignore != NULL, FALSE);
-#line 18815 "Dialogs.c"
+#line 18496 "Dialogs.c"
 	{
 		AppWindow* _tmp0_ = NULL;
 		AppWindow* _tmp1_ = NULL;
 		GdkScreen* _tmp2_ = NULL;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = app_window_get_instance ();
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp0_;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		resources_launch_help (_tmp2_, "other-files.page", &_inner_error_);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp1_);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18832 "Dialogs.c"
+#line 18513 "Dialogs.c"
 			goto __catch424_g_error;
 		}
 	}
@@ -18855,36 +18536,36 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = e;
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_->message;
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_message ("Dialogs.vala:2413: Unable to launch help: %s", _tmp4_);
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_message ("Dialogs.vala:2403: Unable to launch help: %s", _tmp4_);
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 18854 "Dialogs.c"
+#line 18535 "Dialogs.c"
 	}
 	__finally424:
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return FALSE;
-#line 18865 "Dialogs.c"
+#line 18546 "Dialogs.c"
 	}
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18871 "Dialogs.c"
+#line 18552 "Dialogs.c"
 }
 
 
@@ -18919,110 +18600,110 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 	GtkListStore* _tmp68_ = NULL;
 	gint _tmp69_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (current_app_executable != NULL);
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = mime_types;
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__length1 = mime_types_length1;
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0__length1 != 0, "mime_types.length != 0");
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = mime_types;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1__length1 = mime_types_length1;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_vala_external_apps);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_external_apps = _tmp2_;
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _vala_external_apps;
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == 0) {
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (external_apps) {
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*external_apps = _vala_external_apps;
-#line 18940 "Dialogs.c"
+#line 18621 "Dialogs.c"
 		} else {
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_vala_external_apps);
-#line 18944 "Dialogs.c"
+#line 18625 "Dialogs.c"
 		}
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 18948 "Dialogs.c"
+#line 18629 "Dialogs.c"
 	}
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pixbuf_renderer = _tmp6_;
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_renderer = _tmp7_;
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = combo_box;
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout));
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = combo_box;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = pixbuf_renderer;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = combo_box;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = text_renderer;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = combo_box;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = pixbuf_renderer;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = combo_box;
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text_renderer;
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp17_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
+#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	combo_store = _tmp17_;
-#line 2440 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	current_app = -1;
-#line 18996 "Dialogs.c"
+#line 18677 "Dialogs.c"
 	{
 		GeeIterator* _app_it = NULL;
 		SortedList* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = _vala_external_apps;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_app_it = _tmp19_;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 19009 "Dialogs.c"
+#line 18690 "Dialogs.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			GAppInfo* app = NULL;
@@ -19042,44 +18723,44 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			GAppInfo* _tmp61_ = NULL;
 			const gchar* _tmp62_ = NULL;
 			const gchar* _tmp63_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _app_it;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp21_) {
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 19037 "Dialogs.c"
+#line 18718 "Dialogs.c"
 			}
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = _app_it;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app = (GAppInfo*) _tmp23_;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = combo_store;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_append (_tmp24_, &_tmp25_);
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			iter = _tmp25_;
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = app;
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = g_app_info_get_icon (_tmp26_);
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app_icon = _tmp28_;
-#line 19059 "Dialogs.c"
+#line 18740 "Dialogs.c"
 			{
 				GIcon* _tmp29_ = NULL;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp29_ = app_icon;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
-#line 19066 "Dialogs.c"
+#line 18747 "Dialogs.c"
 					GdkPixbuf* _tmp30_ = NULL;
 					GIcon* _tmp31_ = NULL;
 					GFile* _tmp32_ = NULL;
@@ -19091,51 +18772,51 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					GtkTreeIter _tmp38_ = {0};
 					GdkPixbuf* _tmp39_ = NULL;
 					GValue _tmp40_ = {0};
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp31_ = app_icon;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon));
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp33_ = g_file_get_path (_tmp32_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp34_ = _tmp33_;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp36_ = _tmp35_;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp34_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp30_ = _tmp36_;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19096 "Dialogs.c"
+#line 18777 "Dialogs.c"
 						goto __catch425_g_error;
 					}
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp38_ = iter;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					g_value_init (&_tmp40_, gdk_pixbuf_get_type ());
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					g_value_init (&_tmp40_, GDK_TYPE_PIXBUF);
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					g_value_take_object (&_tmp40_, _tmp39_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_object_unref0 (_tmp30_);
-#line 19115 "Dialogs.c"
+#line 18796 "Dialogs.c"
 				} else {
 					GIcon* _tmp41_ = NULL;
-#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp41_ = app_icon;
-#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
-#line 19122 "Dialogs.c"
+#line 18803 "Dialogs.c"
 						GdkPixbuf* icon_pixbuf = NULL;
 						GtkIconTheme* _tmp42_ = NULL;
 						GIcon* _tmp43_ = NULL;
@@ -19147,40 +18828,40 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 						GtkTreeIter _tmp49_ = {0};
 						GdkPixbuf* _tmp50_ = NULL;
 						GValue _tmp51_ = {0};
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp42_ = gtk_icon_theme_get_default ();
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp43_ = app_icon;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon));
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp46_ = _tmp45_[0];
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						icon_pixbuf = _tmp47_;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19148 "Dialogs.c"
+#line 18829 "Dialogs.c"
 							goto __catch425_g_error;
 						}
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp49_ = iter;
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp50_ = icon_pixbuf;
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						g_value_init (&_tmp51_, gdk_pixbuf_get_type ());
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+						g_value_init (&_tmp51_, GDK_TYPE_PIXBUF);
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						g_value_set_object (&_tmp51_, _tmp50_);
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_);
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
-#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_g_object_unref0 (icon_pixbuf);
-#line 19167 "Dialogs.c"
+#line 18848 "Dialogs.c"
 					}
 				}
 			}
@@ -19192,133 +18873,133 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				const gchar* _tmp53_ = NULL;
 				gchar* _tmp54_ = NULL;
 				gchar* _tmp55_ = NULL;
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_error_ = _inner_error_;
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_inner_error_ = NULL;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp52_ = _error_;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp53_ = _tmp52_->message;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL);
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp55_ = _tmp54_;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_warning ("Dialogs.vala:2459: %s", _tmp55_);
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				g_warning ("Dialogs.vala:2449: %s", _tmp55_);
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp55_);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_error_free0 (_error_);
-#line 19197 "Dialogs.c"
+#line 18878 "Dialogs.c"
 			}
 			__finally425:
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app_icon);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_app_it);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (combo_store);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (text_renderer);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (pixbuf_renderer);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_clear_error (&_inner_error_);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 19220 "Dialogs.c"
+#line 18901 "Dialogs.c"
 			}
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = combo_store;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp57_ = iter;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp58_ = app;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp59_ = g_app_info_get_name (_tmp58_);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_init (&_tmp60_, G_TYPE_STRING);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_set_string (&_tmp60_, _tmp59_);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp61_ = app;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp62_ = g_app_info_get_commandline (_tmp61_);
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp63_ = current_app_executable;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
-#line 19246 "Dialogs.c"
+#line 18927 "Dialogs.c"
 				SortedList* _tmp64_ = NULL;
 				GAppInfo* _tmp65_ = NULL;
 				gint _tmp66_ = 0;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _vala_external_apps;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp65_ = app;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_app = _tmp66_;
-#line 19258 "Dialogs.c"
+#line 18939 "Dialogs.c"
 			}
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app_icon);
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app);
-#line 19264 "Dialogs.c"
+#line 18945 "Dialogs.c"
 		}
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_app_it);
-#line 19268 "Dialogs.c"
+#line 18949 "Dialogs.c"
 	}
-#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = combo_box;
-#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = combo_store;
-#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = current_app;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp69_ != -1) {
-#line 19280 "Dialogs.c"
+#line 18961 "Dialogs.c"
 		GtkComboBox* _tmp70_ = NULL;
 		gint _tmp71_ = 0;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = combo_box;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = current_app;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 19289 "Dialogs.c"
+#line 18970 "Dialogs.c"
 	}
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (combo_store);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (text_renderer);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pixbuf_renderer);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (external_apps) {
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*external_apps = _vala_external_apps;
-#line 19301 "Dialogs.c"
+#line 18982 "Dialogs.c"
 	} else {
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_vala_external_apps);
-#line 19305 "Dialogs.c"
+#line 18986 "Dialogs.c"
 	}
 }
 
@@ -19332,35 +19013,35 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 	gboolean found = FALSE;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp32_ = FALSE;
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_ENTRY (entry));
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = configuration_facade_get_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pattern = _tmp3_;
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	found = FALSE;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pattern;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL != _tmp4_) {
-#line 19343 "Dialogs.c"
+#line 19024 "Dialogs.c"
 		gint i = 0;
-#line 2481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 19347 "Dialogs.c"
+#line 19028 "Dialogs.c"
 		{
 			GeeArrayList* _pf_list = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -19370,25 +19051,25 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _pf_index = 0;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = self->priv->path_formats;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_list = _tmp6_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = _pf_list;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tmp8_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_size = _tmp9_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_index = -1;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 19375 "Dialogs.c"
+#line 19056 "Dialogs.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				gint _tmp12_ = 0;
@@ -19400,64 +19081,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 				const gchar* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
 				gint _tmp21_ = 0;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _pf_index;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_pf_index = _tmp10_ + 1;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = _pf_index;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _pf_size;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp11_ < _tmp12_)) {
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19399 "Dialogs.c"
+#line 19080 "Dialogs.c"
 				}
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = _pf_list;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = _pf_index;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				pf = (PreferencesDialogPathFormat*) _tmp15_;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = pf;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = _tmp16_->pattern;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = pattern;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 19417 "Dialogs.c"
+#line 19098 "Dialogs.c"
 					GtkComboBox* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = combo_box;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp20_ = i;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (_tmp19_, _tmp20_);
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					found = TRUE;
-#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_preferences_dialog_path_format_unref0 (pf);
-#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19432 "Dialogs.c"
+#line 19113 "Dialogs.c"
 				}
-#line 2488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = i;
-#line 2488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				i = _tmp21_ + 1;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_preferences_dialog_path_format_unref0 (pf);
-#line 19440 "Dialogs.c"
+#line 19121 "Dialogs.c"
 			}
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_pf_list);
-#line 19444 "Dialogs.c"
+#line 19125 "Dialogs.c"
 		}
 	} else {
 		gchar* s = NULL;
@@ -19467,64 +19148,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 		gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gboolean _tmp27_ = FALSE;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = config_facade_get_instance ();
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = _tmp22_;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp23_);
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		s = _tmp25_;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = s;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = is_string_empty (_tmp26_);
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp27_) {
-#line 19472 "Dialogs.c"
+#line 19153 "Dialogs.c"
 			GtkComboBox* _tmp28_ = NULL;
 			GeeArrayList* _tmp29_ = NULL;
 			gint _tmp30_ = 0;
 			gint _tmp31_ = 0;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = combo_box;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = self->priv->path_formats;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp30_;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			found = TRUE;
-#line 19489 "Dialogs.c"
+#line 19170 "Dialogs.c"
 		}
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (s);
-#line 19493 "Dialogs.c"
+#line 19174 "Dialogs.c"
 	}
-#line 2499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = found;
-#line 2499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp32_) {
-#line 19499 "Dialogs.c"
+#line 19180 "Dialogs.c"
 		GtkComboBox* _tmp33_ = NULL;
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = combo_box;
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp33_, 0);
-#line 19505 "Dialogs.c"
+#line 19186 "Dialogs.c"
 	}
-#line 2503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed (self);
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (pattern);
-#line 19511 "Dialogs.c"
+#line 19192 "Dialogs.c"
 }
 
 
@@ -19541,55 +19222,55 @@ void preferences_dialog_show (void) {
 	gchar* _tmp10_ = NULL;
 	PreferencesDialog* _tmp11_ = NULL;
 	GtkDialog* _tmp12_ = NULL;
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_preferences_dialog;
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 19532 "Dialogs.c"
+#line 19213 "Dialogs.c"
 		PreferencesDialog* _tmp1_ = NULL;
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = preferences_dialog_new ();
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_preferences_dialog_unref0 (preferences_dialog_preferences_dialog);
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_preferences_dialog = _tmp1_;
-#line 19540 "Dialogs.c"
+#line 19221 "Dialogs.c"
 	}
-#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_preferences_dialog;
-#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (_tmp2_);
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = preferences_dialog_preferences_dialog;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_->priv->dialog;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = preferences_dialog_preferences_dialog;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_->priv->library_dir_button;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = app_dirs_get_import_dir ();
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_file_get_path (_tmp8_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp10_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = preferences_dialog_preferences_dialog;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_->priv->dialog;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow));
-#line 19576 "Dialogs.c"
+#line 19257 "Dialogs.c"
 }
 
 
@@ -19614,113 +19295,113 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	gpointer _tmp25_ = NULL;
 	PreferencesDialogPathFormat* _tmp26_ = NULL;
 	const gchar* _tmp27_ = NULL;
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_commit_bg_color (_tmp1_);
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->builder;
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_builder_get_object (_tmp2_, "autoimport");
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp3_) : NULL);
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	autoimport = _tmp4_;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = autoimport;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 19623 "Dialogs.c"
+#line 19304 "Dialogs.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		GtkCheckButton* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = autoimport;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 19643 "Dialogs.c"
+#line 19324 "Dialogs.c"
 	}
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->builder;
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "write_metadata");
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp12_) : NULL);
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	commit_metadata = _tmp13_;
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = commit_metadata;
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ != NULL) {
-#line 19657 "Dialogs.c"
+#line 19338 "Dialogs.c"
 		ConfigFacade* _tmp15_ = NULL;
 		ConfigFacade* _tmp16_ = NULL;
 		GtkCheckButton* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 		gboolean _tmp19_ = FALSE;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = config_facade_get_instance ();
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = _tmp15_;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = commit_metadata;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp19_);
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp16_);
-#line 19677 "Dialogs.c"
+#line 19358 "Dialogs.c"
 	}
-#line 2532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lib_dir;
-#line 2532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ != NULL) {
-#line 19683 "Dialogs.c"
+#line 19364 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->lib_dir;
-#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_dirs_set_import_dir (_tmp21_);
-#line 19689 "Dialogs.c"
+#line 19370 "Dialogs.c"
 	}
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->path_formats;
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->dir_pattern_combo;
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_);
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp25_;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = pf;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = _tmp26_->pattern;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp27_) {
-#line 19707 "Dialogs.c"
+#line 19388 "Dialogs.c"
 		ConfigFacade* _tmp28_ = NULL;
 		ConfigFacade* _tmp29_ = NULL;
 		GtkEntry* _tmp30_ = NULL;
@@ -19728,55 +19409,55 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		const gchar* _tmp32_ = NULL;
 		ConfigFacade* _tmp33_ = NULL;
 		ConfigFacade* _tmp34_ = NULL;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = config_facade_get_instance ();
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = self->priv->dir_pattern_entry;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = gtk_entry_get_text (_tmp30_);
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = _tmp31_;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp32_);
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = config_facade_get_instance ();
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = _tmp33_;
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp34_);
-#line 19737 "Dialogs.c"
+#line 19418 "Dialogs.c"
 	} else {
 		ConfigFacade* _tmp35_ = NULL;
 		ConfigFacade* _tmp36_ = NULL;
 		PreferencesDialogPathFormat* _tmp37_ = NULL;
 		const gchar* _tmp38_ = NULL;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = config_facade_get_instance ();
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = _tmp35_;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = pf;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = _tmp37_->pattern;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp38_);
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp36_);
-#line 19755 "Dialogs.c"
+#line 19436 "Dialogs.c"
 	}
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata);
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (autoimport);
-#line 19763 "Dialogs.c"
+#line 19444 "Dialogs.c"
 }
 
 
@@ -19785,52 +19466,52 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19782 "Dialogs.c"
+#line 19463 "Dialogs.c"
 	}
-#line 2548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp2_;
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19794 "Dialogs.c"
+#line 19475 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_close (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
-#line 2552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 19809 "Dialogs.c"
+#line 19490 "Dialogs.c"
 	}
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 19817 "Dialogs.c"
+#line 19498 "Dialogs.c"
 }
 
 
@@ -19839,19 +19520,19 @@ static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
 	gdouble _tmp1_ = 0.0;
 	GtkAdjustment* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
-#line 2560 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->bg_color_adjustment;
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_adjustment_get_upper (_tmp0_);
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->bg_color_adjustment;
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
-#line 19838 "Dialogs.c"
+#line 19519 "Dialogs.c"
 }
 
 
@@ -19861,84 +19542,84 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 	gboolean _tmp1_ = FALSE;
 	GdkEventButton* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_->button;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == ((guint) 1)) {
-#line 19858 "Dialogs.c"
+#line 19539 "Dialogs.c"
 		GdkEventButton* _tmp4_ = NULL;
 		GdkEventType _tmp5_ = 0;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = event;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_->type;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 19867 "Dialogs.c"
+#line 19548 "Dialogs.c"
 	} else {
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = FALSE;
-#line 19871 "Dialogs.c"
+#line 19552 "Dialogs.c"
 	}
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 19875 "Dialogs.c"
+#line 19556 "Dialogs.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkModifierType _tmp7_ = 0;
 		gboolean _tmp8_ = FALSE;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = event;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_->state;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp8_;
-#line 19887 "Dialogs.c"
+#line 19568 "Dialogs.c"
 	} else {
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 19891 "Dialogs.c"
+#line 19572 "Dialogs.c"
 	}
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 19895 "Dialogs.c"
+#line 19576 "Dialogs.c"
 		GtkScale* _tmp9_ = NULL;
 		GtkAdjustment* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
 		GdkRGBA _tmp12_ = {0};
 		gdouble _tmp13_ = 0.0;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->bg_color_slider;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->bg_color_adjustment;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_adjustment_get_upper (_tmp10_);
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_);
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp12_.red;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f));
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_on_value_changed (self);
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19919 "Dialogs.c"
+#line 19600 "Dialogs.c"
 	}
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19925 "Dialogs.c"
+#line 19606 "Dialogs.c"
 }
 
 
@@ -19950,25 +19631,25 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 	gpointer _tmp3_ = NULL;
 	PreferencesDialogPathFormat* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->path_formats;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_combo;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_);
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp3_;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pf;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_->pattern;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp5_) {
-#line 19955 "Dialogs.c"
+#line 19636 "Dialogs.c"
 		gchar* dir_pattern = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
@@ -19980,78 +19661,78 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 		const gchar* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
 		GtkEntry* _tmp16_ = NULL;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dir_pattern = _tmp9_;
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = dir_pattern;
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_) {
-#line 19985 "Dialogs.c"
+#line 19666 "Dialogs.c"
 			gchar* _tmp12_ = NULL;
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = g_strdup ("");
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (dir_pattern);
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dir_pattern = _tmp12_;
-#line 19993 "Dialogs.c"
+#line 19674 "Dialogs.c"
 		}
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->dir_pattern_entry;
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = dir_pattern;
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp15_, "editable", TRUE, NULL);
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_entry;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dir_pattern);
-#line 20011 "Dialogs.c"
+#line 19692 "Dialogs.c"
 	} else {
 		GtkEntry* _tmp17_ = NULL;
 		PreferencesDialogPathFormat* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 		GtkEntry* _tmp20_ = NULL;
 		GtkEntry* _tmp21_ = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->dir_pattern_entry;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = pf;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_->pattern;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp17_, _tmp19_);
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->dir_pattern_entry;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp20_, "editable", FALSE, NULL);
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->dir_pattern_entry;
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 20034 "Dialogs.c"
+#line 19715 "Dialogs.c"
 	}
-#line 2579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20038 "Dialogs.c"
+#line 19719 "Dialogs.c"
 }
 
 
@@ -20065,92 +19746,92 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 	gboolean _tmp5_ = FALSE;
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->example_date;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_entry;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_date_time_format (_tmp0_, _tmp3_);
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	example = _tmp4_;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = example;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = is_string_empty (_tmp6_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 20072 "Dialogs.c"
+#line 19753 "Dialogs.c"
 		GtkEntry* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->dir_pattern_entry;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_entry_get_text (_tmp8_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = !_tmp11_;
-#line 20087 "Dialogs.c"
+#line 19768 "Dialogs.c"
 	} else {
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = FALSE;
-#line 20091 "Dialogs.c"
+#line 19772 "Dialogs.c"
 	}
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 20095 "Dialogs.c"
+#line 19776 "Dialogs.c"
 		GtkLabel* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		GtkEntry* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
-#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->dir_pattern_example;
-#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Invalid pattern");
-#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp12_, _tmp13_);
-#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->dir_pattern_entry;
-#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp14_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_activatable (_tmp15_, GTK_ENTRY_ICON_SECONDARY, FALSE);
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, FALSE);
-#line 20116 "Dialogs.c"
+#line 19797 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
 		GtkEntry* _tmp18_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_example;
-#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = example;
-#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp16_, _tmp17_);
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->dir_pattern_entry;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp18_, GTK_ENTRY_ICON_SECONDARY, NULL);
-#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, TRUE);
-#line 20133 "Dialogs.c"
+#line 19814 "Dialogs.c"
 	}
-#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (example);
-#line 20137 "Dialogs.c"
+#line 19818 "Dialogs.c"
 }
 
 
@@ -20158,34 +19839,34 @@ static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gbool
 	GtkDialog* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = allow;
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), _tmp1_);
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = allow;
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = _tmp2_;
-#line 20157 "Dialogs.c"
+#line 19838 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->allow_closing;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp0_;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20172 "Dialogs.c"
+#line 19853 "Dialogs.c"
 }
 
 
@@ -20194,21 +19875,21 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd
 	ConfigFacade* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	GdkRGBA _tmp3_ = {0};
-#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = bg_color_value;
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_);
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_set_bg_color (_tmp1_, &_tmp3_);
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20195 "Dialogs.c"
+#line 19876 "Dialogs.c"
 }
 
 
@@ -20217,29 +19898,29 @@ static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble co
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&color, 0, sizeof (GdkRGBA));
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = color_value;
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.red = _tmp0_;
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = color_value;
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.green = _tmp1_;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = color_value;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.blue = _tmp2_;
-#line 2631 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.alpha = 1.0;
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	*result = color;
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return;
-#line 20226 "Dialogs.c"
+#line 19907 "Dialogs.c"
 }
 
 
@@ -20260,77 +19941,77 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->photo_editor_combo;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_photo_apps;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20261 "Dialogs.c"
+#line 19942 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->photo_editor_combo;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20270 "Dialogs.c"
+#line 19951 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_photo_apps;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20283 "Dialogs.c"
+#line 19964 "Dialogs.c"
 	}
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photo_app_choice_index = _tmp0_;
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_photo_apps;
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index);
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = desktop_integration_get_app_open_command (app);
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_);
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = desktop_integration_get_app_open_command (app);
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = _tmp17_;
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2644: setting external photo editor to: %s", _tmp18_);
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2634: setting external photo editor to: %s", _tmp18_);
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp18_);
-#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20317 "Dialogs.c"
+#line 19998 "Dialogs.c"
 }
 
 
@@ -20349,69 +20030,69 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 	ConfigFacade* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
-#line 2647 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->raw_editor_combo;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_raw_apps;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20350 "Dialogs.c"
+#line 20031 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->raw_editor_combo;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20359 "Dialogs.c"
+#line 20040 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_raw_apps;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20372 "Dialogs.c"
+#line 20053 "Dialogs.c"
 	}
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	raw_app_choice_index = _tmp0_;
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_raw_apps;
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index);
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = g_app_info_get_commandline (app);
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = g_app_info_get_commandline (app);
-#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2655: setting external raw editor to: %s", _tmp16_);
-#line 2647 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2645: setting external raw editor to: %s", _tmp16_);
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20398 "Dialogs.c"
+#line 20079 "Dialogs.c"
 }
 
 
@@ -20419,50 +20100,50 @@ static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDial
 	RawDeveloper result = 0;
 	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
-#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->default_raw_developer_combo;
-#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == 0) {
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = RAW_DEVELOPER_CAMERA;
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 20418 "Dialogs.c"
+#line 20099 "Dialogs.c"
 	}
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = RAW_DEVELOPER_SHOTWELL;
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20424 "Dialogs.c"
+#line 20105 "Dialogs.c"
 }
 
 
 static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
 	RawDeveloper _tmp0_ = 0;
-#line 2664 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = d;
-#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 20436 "Dialogs.c"
+#line 20117 "Dialogs.c"
 		GtkComboBoxText* _tmp1_ = NULL;
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->default_raw_developer_combo;
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 20442 "Dialogs.c"
+#line 20123 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp2_ = NULL;
-#line 2668 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = self->priv->default_raw_developer_combo;
-#line 2668 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1);
-#line 20449 "Dialogs.c"
+#line 20130 "Dialogs.c"
 	}
 }
 
@@ -20471,60 +20152,60 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial
 	ConfigFacade* _tmp0_ = NULL;
 	ConfigFacade* _tmp1_ = NULL;
 	RawDeveloper _tmp2_ = 0;
-#line 2671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_raw_developer_from_combo (self);
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20470 "Dialogs.c"
+#line 20151 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
 	GtkFileChooserButton* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = _tmp1_;
-#line 20487 "Dialogs.c"
+#line 20168 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
-#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
-#line 20494 "Dialogs.c"
+#line 20175 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	GtkFileChooserButton* _tmp0_ = NULL;
-#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self);
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20511 "Dialogs.c"
+#line 20192 "Dialogs.c"
 }
 
 
@@ -20536,31 +20217,31 @@ static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, cons
 	GeeArrayList* _tmp3_ = NULL;
 	GtkComboBoxText* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (name != NULL);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = pattern;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = _tmp2_;
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->path_formats;
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->dir_pattern_combo;
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = name;
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
-#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20547 "Dialogs.c"
+#line 20228 "Dialogs.c"
 }
 
 
@@ -20569,21 +20250,21 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	GtkCheckButton* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->lowercase;
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20570 "Dialogs.c"
+#line 20251 "Dialogs.c"
 }
 
 
@@ -20593,246 +20274,246 @@ static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GT
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->name = _tmp1_;
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pattern;
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->pattern = _tmp3_;
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 20602 "Dialogs.c"
+#line 20283 "Dialogs.c"
 }
 
 
 static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
-#line 20609 "Dialogs.c"
+#line 20290 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_init (GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20616 "Dialogs.c"
+#line 20297 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_free_value (GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (value->data[0].v_pointer);
-#line 20625 "Dialogs.c"
+#line 20306 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer);
-#line 20635 "Dialogs.c"
+#line 20316 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20639 "Dialogs.c"
+#line 20320 "Dialogs.c"
 	}
 }
 
 
 static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20647 "Dialogs.c"
+#line 20328 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20654 "Dialogs.c"
+#line 20335 "Dialogs.c"
 		PreferencesDialogPathFormat* object;
 		object = collect_values[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20661 "Dialogs.c"
+#line 20342 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20665 "Dialogs.c"
+#line 20346 "Dialogs.c"
 		}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 20669 "Dialogs.c"
+#line 20350 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20673 "Dialogs.c"
+#line 20354 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20677 "Dialogs.c"
+#line 20358 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialogPathFormat** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20688 "Dialogs.c"
+#line 20369 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20694 "Dialogs.c"
+#line 20375 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20698 "Dialogs.c"
+#line 20379 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20702 "Dialogs.c"
+#line 20383 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20706 "Dialogs.c"
+#line 20387 "Dialogs.c"
 }
 
 
 static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PreferencesDialogParamSpecPathFormat* spec;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20720 "Dialogs.c"
+#line 20401 "Dialogs.c"
 }
 
 
 static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20729 "Dialogs.c"
+#line 20410 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20749 "Dialogs.c"
+#line 20430 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20753 "Dialogs.c"
+#line 20434 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20759 "Dialogs.c"
+#line 20440 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 20778 "Dialogs.c"
+#line 20459 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20782 "Dialogs.c"
+#line 20463 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20788 "Dialogs.c"
+#line 20469 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
-#line 20798 "Dialogs.c"
+#line 20479 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 20805 "Dialogs.c"
+#line 20486 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat* obj) {
 	PreferencesDialogPathFormat * self;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2280 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 20819 "Dialogs.c"
+#line 20500 "Dialogs.c"
 }
 
 
@@ -20853,216 +20534,216 @@ static GType preferences_dialog_path_format_get_type (void) {
 static gpointer preferences_dialog_path_format_ref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20844 "Dialogs.c"
+#line 20525 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_unref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 20857 "Dialogs.c"
+#line 20538 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_init (GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20865 "Dialogs.c"
+#line 20546 "Dialogs.c"
 }
 
 
 static void value_preferences_dialog_free_value (GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (value->data[0].v_pointer);
-#line 20874 "Dialogs.c"
+#line 20555 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_ref (src_value->data[0].v_pointer);
-#line 20884 "Dialogs.c"
+#line 20565 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20888 "Dialogs.c"
+#line 20569 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_preferences_dialog_peek_pointer (const GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20896 "Dialogs.c"
+#line 20577 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20903 "Dialogs.c"
+#line 20584 "Dialogs.c"
 		PreferencesDialog* object;
 		object = collect_values[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20910 "Dialogs.c"
+#line 20591 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20914 "Dialogs.c"
+#line 20595 "Dialogs.c"
 		}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_ref (object);
-#line 20918 "Dialogs.c"
+#line 20599 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20922 "Dialogs.c"
+#line 20603 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20926 "Dialogs.c"
+#line 20607 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialog** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20937 "Dialogs.c"
+#line 20618 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20943 "Dialogs.c"
+#line 20624 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20947 "Dialogs.c"
+#line 20628 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_ref (value->data[0].v_pointer);
-#line 20951 "Dialogs.c"
+#line 20632 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20955 "Dialogs.c"
+#line 20636 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPreferencesDialog* spec;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20969 "Dialogs.c"
+#line 20650 "Dialogs.c"
 }
 
 
 gpointer value_get_preferences_dialog (const GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20978 "Dialogs.c"
+#line 20659 "Dialogs.c"
 }
 
 
 void value_set_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_ref (value->data[0].v_pointer);
-#line 20998 "Dialogs.c"
+#line 20679 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 21002 "Dialogs.c"
+#line 20683 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 21008 "Dialogs.c"
+#line 20689 "Dialogs.c"
 	}
 }
 
 
 void value_take_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 21027 "Dialogs.c"
+#line 20708 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 21031 "Dialogs.c"
+#line 20712 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 21037 "Dialogs.c"
+#line 20718 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogClass *) klass)->finalize = preferences_dialog_finalize;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate));
-#line 21049 "Dialogs.c"
+#line 20730 "Dialogs.c"
 }
 
 
@@ -21070,73 +20751,73 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) {
 	GeeArrayList* _tmp0_ = NULL;
 	GDateTime* _tmp1_ = NULL;
 	PluginsManifestWidgetMediator* _tmp2_ = NULL;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PREFERENCES_DIALOG_GET_PRIVATE (self);
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = FALSE;
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = NULL;
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, preferences_dialog_path_format_unref, NULL, NULL, NULL);
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->path_formats = _tmp0_;
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_date_time_new_local (2009, 3, 10, 18, 16, (gdouble) 11);
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->example_date = _tmp1_;
-#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = plugins_manifest_widget_mediator_new ();
-#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->plugins_mediator = _tmp2_;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 21077 "Dialogs.c"
+#line 20758 "Dialogs.c"
 }
 
 
 static void preferences_dialog_finalize (PreferencesDialog* obj) {
 	PreferencesDialog * self;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->path_formats);
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_date_time_unref0 (self->priv->example_date);
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
-#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_plugins_manifest_widget_mediator_unref0 (self->priv->plugins_mediator);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 21123 "Dialogs.c"
+#line 20804 "Dialogs.c"
 }
 
 
@@ -21157,24 +20838,24 @@ GType preferences_dialog_get_type (void) {
 gpointer preferences_dialog_ref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 21148 "Dialogs.c"
+#line 20829 "Dialogs.c"
 }
 
 
 void preferences_dialog_unref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_GET_CLASS (self)->finalize (self);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 21161 "Dialogs.c"
+#line 20842 "Dialogs.c"
 	}
 }
 
@@ -21194,54 +20875,54 @@ GtkResponseType copy_files_dialog (void) {
 	const gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Shotwell can copy the photos into your library folder or it can import" \
 " them without copying.");
-#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp1_;
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", msg);
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 2707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Co_py Photos");
-#line 2707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_ACCEPT);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("_Import in Place");
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp7_, (gint) GTK_RESPONSE_REJECT);
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import to Library");
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp8_);
-#line 2711 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 2711 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21227 "Dialogs.c"
+#line 20908 "Dialogs.c"
 }
 
 
@@ -21252,47 +20933,47 @@ void remove_photos_from_library (GeeCollection* photos) {
 	gint _tmp3_ = 0;
 	GeeCollection* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = photos;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_collection_get_size (_tmp1_);
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == 1) {
-#line 21248 "Dialogs.c"
+#line 20929 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Removing Photo From Library");
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_;
-#line 21254 "Dialogs.c"
+#line 20935 "Dialogs.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _ ("Removing Photos From Library");
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_;
-#line 21261 "Dialogs.c"
+#line 20942 "Dialogs.c"
 	}
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("Remove From Library");
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remove_from_app (_tmp6_, _tmp7_, _tmp0_);
-#line 21269 "Dialogs.c"
+#line 20950 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21278 "Dialogs.c"
+#line 20959 "Dialogs.c"
 }
 
 
@@ -21363,71 +21044,71 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	ProgressDialog* _tmp122_ = NULL;
 	AppWindow* _tmp124_ = NULL;
 	AppWindow* _tmp125_ = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (dialog_title != NULL);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (progress_dialog_text != NULL);
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = sources;
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ == 0) {
-#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21365 "Dialogs.c"
+#line 21046 "Dialogs.c"
 	}
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photos = _tmp3_;
-#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	videos = _tmp4_;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = sources;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = videos;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_filter_media (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	user_message = NULL;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = photos;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp11_) {
-#line 21393 "Dialogs.c"
+#line 21074 "Dialogs.c"
 		GeeArrayList* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = videos;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp13_;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp14_;
-#line 21405 "Dialogs.c"
+#line 21086 "Dialogs.c"
 	} else {
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = FALSE;
-#line 21409 "Dialogs.c"
+#line 21090 "Dialogs.c"
 	}
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_) {
-#line 21413 "Dialogs.c"
+#line 21094 "Dialogs.c"
 		GeeCollection* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
@@ -21436,13 +21117,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		gint _tmp20_ = 0;
 		gint _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = sources;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gee_collection_get_size (_tmp15_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = ngettext ("This will remove the photo/video from your Shotwell library. Would you" \
 " also like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21450,32 +21131,32 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "u also like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp17_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = sources;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_collection_get_size (_tmp19_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp20_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = g_strdup_printf (_tmp18_, _tmp21_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_message = _tmp22_;
-#line 21442 "Dialogs.c"
+#line 21123 "Dialogs.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = videos;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp25_) {
-#line 21455 "Dialogs.c"
+#line 21136 "Dialogs.c"
 			GeeCollection* _tmp26_ = NULL;
 			gint _tmp27_ = 0;
 			gint _tmp28_ = 0;
@@ -21484,13 +21165,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp31_ = 0;
 			gint _tmp32_ = 0;
 			gchar* _tmp33_ = NULL;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = sources;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = gee_collection_get_size (_tmp26_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _tmp27_;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = ngettext ("This will remove the video from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21498,19 +21179,19 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp28_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = sources;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = gee_collection_get_size (_tmp30_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp32_ = _tmp31_;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp33_ = g_strdup_printf (_tmp29_, _tmp32_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp33_;
-#line 21484 "Dialogs.c"
+#line 21165 "Dialogs.c"
 		} else {
 			GeeCollection* _tmp34_ = NULL;
 			gint _tmp35_ = 0;
@@ -21520,13 +21201,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
 			gchar* _tmp41_ = NULL;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp34_ = sources;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp35_ = gee_collection_get_size (_tmp34_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp36_ = _tmp35_;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp37_ = ngettext ("This will remove the photo from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21534,208 +21215,208 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp36_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp38_ = sources;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp39_ = gee_collection_get_size (_tmp38_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp40_ = _tmp39_;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp41_ = g_strdup_printf (_tmp37_, _tmp40_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp41_;
-#line 21514 "Dialogs.c"
+#line 21195 "Dialogs.c"
 		}
 	}
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = app_window_get_instance ();
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = _tmp42_;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = dialog_title;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = user_message;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = sources;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = gee_collection_get_size (_tmp46_);
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = _tmp47_;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), _tmp44_, _tmp45_, _tmp48_);
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _tmp49_;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp43_);
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp50_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = _result_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp52_ != GTK_RESPONSE_YES) {
-#line 21543 "Dialogs.c"
+#line 21224 "Dialogs.c"
 		GtkResponseType _tmp53_ = 0;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = _result_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = _tmp53_ != GTK_RESPONSE_NO;
-#line 21549 "Dialogs.c"
+#line 21230 "Dialogs.c"
 	} else {
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = FALSE;
-#line 21553 "Dialogs.c"
+#line 21234 "Dialogs.c"
 	}
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp51_) {
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (videos);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (photos);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21565 "Dialogs.c"
+#line 21246 "Dialogs.c"
 	}
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = _result_;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	delete_backing = _tmp54_ == GTK_RESPONSE_YES;
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = app_window_get_instance ();
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = _tmp55_;
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp56_);
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress = NULL;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp57_ = sources;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = gee_collection_get_size (_tmp57_);
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = _tmp58_;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp59_ >= 20) {
-#line 21595 "Dialogs.c"
+#line 21276 "Dialogs.c"
 		AppWindow* _tmp60_ = NULL;
 		AppWindow* _tmp61_ = NULL;
 		const gchar* _tmp62_ = NULL;
 		ProgressDialog* _tmp63_ = NULL;
 		ProgressDialog* _tmp64_ = NULL;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp60_ = app_window_get_instance ();
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = _tmp60_;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp62_ = progress_dialog_text;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp63_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_window_get_type (), GtkWindow), _tmp62_, NULL);
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp63_);
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (progress);
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress = _tmp63_;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp61_);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp64_ = progress;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = _progress_dialog_monitor_progress_monitor;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = g_object_ref (_tmp64_);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21633 "Dialogs.c"
+#line 21314 "Dialogs.c"
 	}
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_photos = _tmp65_;
-#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_videos = _tmp66_;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = library_photo_global;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = photos;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = delete_backing;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = monitor;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70__target = monitor_target;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = not_removed_photos;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection), _tmp69_, _tmp70_, _tmp70__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_LIST, GeeList));
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = video_global;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = videos;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = delete_backing;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = monitor;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75__target = monitor_target;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = not_removed_videos;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp74_, _tmp75_, _tmp75__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = not_removed_photos;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = _tmp78_;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = not_removed_videos;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = _tmp81_;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	num_not_removed = _tmp79_ + _tmp82_;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = delete_backing;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp84_) {
-#line 21689 "Dialogs.c"
+#line 21370 "Dialogs.c"
 		gint _tmp85_ = 0;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = num_not_removed;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = _tmp85_ > 0;
-#line 21695 "Dialogs.c"
+#line 21376 "Dialogs.c"
 	} else {
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = FALSE;
-#line 21699 "Dialogs.c"
+#line 21380 "Dialogs.c"
 	}
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp83_) {
-#line 21703 "Dialogs.c"
+#line 21384 "Dialogs.c"
 		gchar* not_deleted_message = NULL;
 		gint _tmp86_ = 0;
 		const gchar* _tmp87_ = NULL;
@@ -21749,39 +21430,39 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		GtkResponseType _tmp94_ = 0;
 		GtkResponseType _tmp95_ = 0;
 		GtkResponseType _tmp96_ = 0;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = num_not_removed;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp87_ = ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \
 "file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \
 "iles?", (gulong) _tmp86_);
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = num_not_removed;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp89_ = g_strdup_printf (_tmp87_, _tmp88_);
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		not_deleted_message = _tmp89_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = app_window_get_instance ();
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = _tmp90_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = dialog_title;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp93_ = not_deleted_message;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp94_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_window_get_type (), GtkWindow), _tmp92_, _tmp93_);
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = _tmp94_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp91_);
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result_delete = _tmp95_;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = result_delete;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (GTK_RESPONSE_YES == _tmp96_) {
-#line 21747 "Dialogs.c"
+#line 21428 "Dialogs.c"
 			GeeArrayList* not_deleted_photos = NULL;
 			GeeArrayList* _tmp97_ = NULL;
 			GeeArrayList* not_deleted_videos = NULL;
@@ -21804,57 +21485,57 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp111_ = 0;
 			gint _tmp112_ = 0;
 			gint _tmp113_ = 0;
-#line 2782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp97_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_photos = _tmp97_;
-#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp98_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_videos = _tmp98_;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = library_photo_global;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp100_ = not_removed_photos;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101_ = monitor;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101__target = monitor_target;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp102_ = not_deleted_photos;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList));
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp103_ = video_global;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp104_ = not_removed_videos;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105_ = monitor;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105__target = monitor_target;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp106_ = not_deleted_videos;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection), _tmp105_, _tmp105__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_LIST, GeeList));
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp107_ = not_deleted_photos;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp109_ = _tmp108_;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp110_ = not_deleted_videos;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp111_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp112_ = _tmp111_;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			num_not_deleted = _tmp109_ + _tmp112_;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp113_ = num_not_deleted;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp113_ > 0) {
-#line 21820 "Dialogs.c"
+#line 21501 "Dialogs.c"
 				gchar* delete_failed_message = NULL;
 				gint _tmp114_ = 0;
 				const gchar* _tmp115_ = NULL;
@@ -21864,83 +21545,83 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 				const gchar* _tmp119_ = NULL;
 				AppWindow* _tmp120_ = NULL;
 				AppWindow* _tmp121_ = NULL;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp114_ = num_not_deleted;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp115_ = ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp114_);
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp116_ = num_not_deleted;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp117_ = g_strdup_printf (_tmp115_, _tmp116_);
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				delete_failed_message = _tmp117_;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp118_ = dialog_title;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp119_ = delete_failed_message;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp120_ = app_window_get_instance ();
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp121_ = _tmp120_;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				app_window_error_message_with_title (_tmp118_, _tmp119_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp121_);
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (delete_failed_message);
-#line 21854 "Dialogs.c"
+#line 21535 "Dialogs.c"
 			}
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_videos);
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_photos);
-#line 21860 "Dialogs.c"
+#line 21541 "Dialogs.c"
 		}
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (not_deleted_message);
-#line 21864 "Dialogs.c"
+#line 21545 "Dialogs.c"
 	}
-#line 2799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = progress;
-#line 2799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp122_ != NULL) {
-#line 21870 "Dialogs.c"
+#line 21551 "Dialogs.c"
 		ProgressDialog* _tmp123_ = NULL;
-#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = progress;
-#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_close (_tmp123_);
-#line 21876 "Dialogs.c"
+#line 21557 "Dialogs.c"
 	}
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = app_window_get_instance ();
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp125_ = _tmp124_;
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp125_);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_videos);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_photos);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (progress);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (user_message);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (videos);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (photos);
-#line 21906 "Dialogs.c"
+#line 21587 "Dialogs.c"
 }