Merge branch 'feature/upstream' into develop

1 files changed, 147 insertions, 122 deletions

diff --git a/src/dialogs/SetBackgroundSlideshow.c b/src/dialogs/SetBackgroundSlideshow.c
index 6e13d67..aa581d4 100644
--- a/src/dialogs/SetBackgroundSlideshow.c
+++ b/src/dialogs/SetBackgroundSlideshow.c
@@ -1,4 +1,4 @@
-/* SetBackgroundSlideshow.c generated by valac 0.36.6, the Vala compiler
+/* SetBackgroundSlideshow.c generated by valac 0.40.4, the Vala compiler
  * generated from SetBackgroundSlideshow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -28,6 +29,11 @@
 typedef struct _SetBackgroundSlideshowDialog SetBackgroundSlideshowDialog;
 typedef struct _SetBackgroundSlideshowDialogClass SetBackgroundSlideshowDialogClass;
 typedef struct _SetBackgroundSlideshowDialogPrivate SetBackgroundSlideshowDialogPrivate;
+enum  {
+	SET_BACKGROUND_SLIDESHOW_DIALOG_0_PROPERTY,
+	SET_BACKGROUND_SLIDESHOW_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* set_background_slideshow_dialog_properties[SET_BACKGROUND_SLIDESHOW_DIALOG_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -73,9 +79,6 @@ static gpointer set_background_slideshow_dialog_parent_class = NULL;
 
 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  {
-	SET_BACKGROUND_SLIDESHOW_DIALOG_DUMMY_PROPERTY
-};
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void);
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type);
 gint resources_use_header_bar (void);
@@ -85,53 +88,63 @@ AppWindow* app_window_get_instance (void);
 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_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 (GObject * obj);
 
 
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) {
+SetBackgroundSlideshowDialog*
+set_background_slideshow_dialog_construct (GType object_type)
+{
 	SetBackgroundSlideshowDialog * self = NULL;
-	gint _tmp0_;
+	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
-	AppWindow* _tmp2_;
-#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp0_ = resources_use_header_bar ();
 #line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+	self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
 #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp1_ = app_window_get_instance ();
+	_tmp0_ = app_window_get_instance ();
 #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow));
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
 #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	return self;
-#line 114 "SetBackgroundSlideshow.c"
+#line 121 "SetBackgroundSlideshow.c"
 }
 
 
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
+SetBackgroundSlideshowDialog*
+set_background_slideshow_dialog_new (void)
+{
 #line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 121 "SetBackgroundSlideshow.c"
+#line 130 "SetBackgroundSlideshow.c"
 }
 
 
-static void set_background_slideshow_dialog_real_constructed (GObject* base) {
+static void
+set_background_slideshow_dialog_real_constructed (GObject* base)
+{
 	SetBackgroundSlideshowDialog * self;
 #line 26 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
 #line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	set_background_slideshow_dialog_on_delay_scale_value_changed (self);
-#line 131 "SetBackgroundSlideshow.c"
+#line 142 "SetBackgroundSlideshow.c"
 }
 
 
-static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) {
+static void
+set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self)
+{
 	gboolean _tmp0_ = FALSE;
 	GtkCheckButton* _tmp1_;
 	gboolean _tmp2_;
@@ -148,7 +161,7 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl
 	if (_tmp3_) {
 #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 		_tmp0_ = TRUE;
-#line 152 "SetBackgroundSlideshow.c"
+#line 165 "SetBackgroundSlideshow.c"
 	} else {
 		GtkCheckButton* _tmp4_;
 		gboolean _tmp5_;
@@ -161,22 +174,27 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl
 		_tmp6_ = _tmp5_;
 #line 34 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 		_tmp0_ = _tmp6_;
-#line 165 "SetBackgroundSlideshow.c"
+#line 178 "SetBackgroundSlideshow.c"
 	}
 #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 169 "SetBackgroundSlideshow.c"
+#line 182 "SetBackgroundSlideshow.c"
 }
 
 
-static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+                                                                                gpointer self)
+{
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self);
-#line 176 "SetBackgroundSlideshow.c"
+#line 192 "SetBackgroundSlideshow.c"
 }
 
 
-static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self) {
+static void
+set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self)
+{
 	gdouble value = 0.0;
 	GtkScale* _tmp0_;
 	GtkAdjustment* _tmp1_;
@@ -184,12 +202,10 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 	gdouble _tmp3_;
 	gdouble _tmp4_;
 	gdouble _tmp5_;
-	gdouble _tmp6_;
-	gdouble _tmp7_;
 	gchar* text = NULL;
-	gint _tmp8_;
-	GtkLabel* _tmp25_;
-	const gchar* _tmp26_;
+	gint _tmp6_;
+	GtkLabel* _tmp23_;
+	const gchar* _tmp24_;
 #line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
 #line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
@@ -207,171 +223,172 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 #line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	_tmp5_ = value;
 #line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp6_ = pow (_tmp5_, (gdouble) 5);
-#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp7_ = pow ((gdouble) 90, (gdouble) 5);
-#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5);
+	self->priv->delay_value = (gint) (((((pow (_tmp5_, (gdouble) 5) / pow ((gdouble) 90, (gdouble) 5)) * 60) * 60) * 24) + 5);
 #line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp8_ = self->priv->delay_value;
+	_tmp6_ = self->priv->delay_value;
 #line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	if (_tmp8_ < 60) {
-#line 220 "SetBackgroundSlideshow.c"
-		gint _tmp9_;
-		gint _tmp10_;
-		gchar* _tmp11_;
+	if (_tmp6_ < 60) {
+#line 232 "SetBackgroundSlideshow.c"
+		gint _tmp7_;
+		gint _tmp8_;
+		gchar* _tmp9_;
 #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-		_tmp9_ = self->priv->delay_value;
+		_tmp7_ = self->priv->delay_value;
 #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-		_tmp10_ = self->priv->delay_value;
+		_tmp8_ = self->priv->delay_value;
 #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-		_tmp11_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp9_), _tmp10_);
+		_tmp9_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp7_), _tmp8_);
 #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 		_g_free0 (text);
 #line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-		text = _tmp11_;
-#line 234 "SetBackgroundSlideshow.c"
+		text = _tmp9_;
+#line 246 "SetBackgroundSlideshow.c"
 	} else {
-		gint _tmp12_;
+		gint _tmp10_;
 #line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-		_tmp12_ = self->priv->delay_value;
+		_tmp10_ = self->priv->delay_value;
 #line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-		if (_tmp12_ < (60 * 60)) {
-#line 241 "SetBackgroundSlideshow.c"
+		if (_tmp10_ < (60 * 60)) {
+#line 253 "SetBackgroundSlideshow.c"
 			gint minutes = 0;
+			gint _tmp11_;
+			gint _tmp12_;
 			gint _tmp13_;
-			gint _tmp14_;
+			gchar* _tmp14_;
 			gint _tmp15_;
-			gchar* _tmp16_;
-			gint _tmp17_;
 #line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			_tmp13_ = self->priv->delay_value;
+			_tmp11_ = self->priv->delay_value;
 #line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			minutes = _tmp13_ / 60;
+			minutes = _tmp11_ / 60;
 #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			_tmp14_ = minutes;
+			_tmp12_ = minutes;
 #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			_tmp15_ = minutes;
+			_tmp13_ = minutes;
 #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			_tmp16_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp14_), _tmp15_);
+			_tmp14_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp12_), _tmp13_);
 #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 			_g_free0 (text);
 #line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			text = _tmp16_;
+			text = _tmp14_;
 #line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			_tmp17_ = minutes;
+			_tmp15_ = minutes;
 #line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			self->priv->delay_value = _tmp17_ * 60;
-#line 266 "SetBackgroundSlideshow.c"
+			self->priv->delay_value = _tmp15_ * 60;
+#line 278 "SetBackgroundSlideshow.c"
 		} else {
-			gint _tmp18_;
+			gint _tmp16_;
 #line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			_tmp18_ = self->priv->delay_value;
+			_tmp16_ = self->priv->delay_value;
 #line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-			if (_tmp18_ < ((60 * 60) * 24)) {
-#line 273 "SetBackgroundSlideshow.c"
+			if (_tmp16_ < ((60 * 60) * 24)) {
+#line 285 "SetBackgroundSlideshow.c"
 				gint hours = 0;
+				gint _tmp17_;
+				gint _tmp18_;
 				gint _tmp19_;
-				gint _tmp20_;
+				gchar* _tmp20_;
 				gint _tmp21_;
-				gchar* _tmp22_;
-				gint _tmp23_;
 #line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				_tmp19_ = self->priv->delay_value;
+				_tmp17_ = self->priv->delay_value;
 #line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				hours = _tmp19_ / (60 * 60);
+				hours = _tmp17_ / (60 * 60);
 #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				_tmp20_ = hours;
+				_tmp18_ = hours;
 #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				_tmp21_ = hours;
+				_tmp19_ = hours;
 #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				_tmp22_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp20_), _tmp21_);
+				_tmp20_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp18_), _tmp19_);
 #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 				_g_free0 (text);
 #line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				text = _tmp22_;
+				text = _tmp20_;
 #line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				_tmp23_ = hours;
+				_tmp21_ = hours;
 #line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				self->priv->delay_value = _tmp23_ * (60 * 60);
-#line 298 "SetBackgroundSlideshow.c"
+				self->priv->delay_value = _tmp21_ * (60 * 60);
+#line 310 "SetBackgroundSlideshow.c"
 			} else {
-				gchar* _tmp24_;
+				gchar* _tmp22_;
 #line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				_tmp24_ = g_strdup (_ ("1 day"));
+				_tmp22_ = g_strdup (_ ("1 day"));
 #line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 				_g_free0 (text);
 #line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-				text = _tmp24_;
+				text = _tmp22_;
 #line 60 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 				self->priv->delay_value = (60 * 60) * 24;
-#line 309 "SetBackgroundSlideshow.c"
+#line 321 "SetBackgroundSlideshow.c"
 			}
 		}
 	}
 #line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp25_ = self->priv->delay_value_label;
+	_tmp23_ = self->priv->delay_value_label;
 #line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp26_ = text;
+	_tmp24_ = text;
 #line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	gtk_label_set_label (_tmp25_, _tmp26_);
+	gtk_label_set_label (_tmp23_, _tmp24_);
 #line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	_g_free0 (text);
-#line 321 "SetBackgroundSlideshow.c"
+#line 333 "SetBackgroundSlideshow.c"
 }
 
 
-static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender,
+                                                                                       gpointer self)
+{
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 328 "SetBackgroundSlideshow.c"
+#line 343 "SetBackgroundSlideshow.c"
 }
 
 
-gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver) {
+gboolean
+set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self,
+                                         gint* delay_value,
+                                         gboolean* desktop_background,
+                                         gboolean* screensaver)
+{
 	gint _vala_delay_value = 0;
 	gboolean _vala_desktop_background = FALSE;
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
 	gint _tmp0_;
-	gint _tmp1_;
-	GtkCheckButton* _tmp2_;
+	GtkCheckButton* _tmp1_;
+	gboolean _tmp2_;
 	gboolean _tmp3_;
-	gboolean _tmp4_;
-	GtkCheckButton* _tmp5_;
+	GtkCheckButton* _tmp4_;
+	gboolean _tmp5_;
 	gboolean _tmp6_;
-	gboolean _tmp7_;
 #line 66 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
 #line 67 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+	_result_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK);
 #line 69 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp1_ = self->priv->delay_value;
+	_tmp0_ = self->priv->delay_value;
 #line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_vala_delay_value = _tmp1_;
+	_vala_delay_value = _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp2_ = self->priv->desktop_background_checkbox;
+	_tmp1_ = self->priv->desktop_background_checkbox;
 #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_vala_desktop_background = _tmp4_;
+	_vala_desktop_background = _tmp3_;
 #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp5_ = self->priv->screensaver_checkbox;
+	_tmp4_ = self->priv->screensaver_checkbox;
 #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
-	_vala_screensaver = _tmp7_;
+	_vala_screensaver = _tmp6_;
 #line 75 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
@@ -380,27 +397,29 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
 	if (delay_value) {
 #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 		*delay_value = _vala_delay_value;
-#line 384 "SetBackgroundSlideshow.c"
+#line 401 "SetBackgroundSlideshow.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	if (desktop_background) {
 #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 		*desktop_background = _vala_desktop_background;
-#line 390 "SetBackgroundSlideshow.c"
+#line 407 "SetBackgroundSlideshow.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	if (screensaver) {
 #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 		*screensaver = _vala_screensaver;
-#line 396 "SetBackgroundSlideshow.c"
+#line 413 "SetBackgroundSlideshow.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	return result;
-#line 400 "SetBackgroundSlideshow.c"
+#line 417 "SetBackgroundSlideshow.c"
 }
 
 
-static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) {
+static void
+set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass)
+{
 	gint SetBackgroundSlideshowDialog_private_offset;
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -426,22 +445,26 @@ static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDi
 	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 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.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 430 "SetBackgroundSlideshow.c"
+#line 449 "SetBackgroundSlideshow.c"
 }
 
 
-static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) {
+static void
+set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self)
+{
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
 #line 19 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	self->priv->delay_value = 0;
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 441 "SetBackgroundSlideshow.c"
+#line 462 "SetBackgroundSlideshow.c"
 }
 
 
-static void set_background_slideshow_dialog_finalize (GObject * obj) {
+static void
+set_background_slideshow_dialog_finalize (GObject * obj)
+{
 	SetBackgroundSlideshowDialog * self;
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
@@ -455,11 +478,13 @@ static void set_background_slideshow_dialog_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->delay_value_label);
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
 	G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 459 "SetBackgroundSlideshow.c"
+#line 482 "SetBackgroundSlideshow.c"
 }
 
 
-GType set_background_slideshow_dialog_get_type (void) {
+GType
+set_background_slideshow_dialog_get_type (void)
+{
 	static volatile gsize set_background_slideshow_dialog_type_id__volatile = 0;
 	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 };