Merge branch 'feature/upstream' into develop

1 files changed, 73 insertions, 52 deletions

diff --git a/src/dialogs/SetBackground.c b/src/dialogs/SetBackground.c
index 3f4d45f..88577ce 100644
--- a/src/dialogs/SetBackground.c
+++ b/src/dialogs/SetBackground.c
@@ -1,4 +1,4 @@
-/* SetBackground.c generated by valac 0.36.6, the Vala compiler
+/* SetBackground.c generated by valac 0.40.4, the Vala compiler
  * generated from SetBackground.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>
@@ -23,6 +24,11 @@
 typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog;
 typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass;
 typedef struct _SetBackgroundPhotoDialogPrivate SetBackgroundPhotoDialogPrivate;
+enum  {
+	SET_BACKGROUND_PHOTO_DIALOG_0_PROPERTY,
+	SET_BACKGROUND_PHOTO_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* set_background_photo_dialog_properties[SET_BACKGROUND_PHOTO_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 ())
@@ -64,9 +70,6 @@ static gpointer set_background_photo_dialog_parent_class = NULL;
 
 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);
 gint resources_use_header_bar (void);
@@ -74,42 +77,48 @@ GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 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_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);
 
 
-SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
+SetBackgroundPhotoDialog*
+set_background_photo_dialog_construct (GType object_type)
+{
 	SetBackgroundPhotoDialog * self = NULL;
-	gint _tmp0_;
+	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
-	AppWindow* _tmp2_;
-#line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp0_ = resources_use_header_bar ();
 #line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+	self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
 #line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp1_ = app_window_get_instance ();
+	_tmp0_ = app_window_get_instance ();
 #line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.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 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	return self;
-#line 102 "SetBackground.c"
+#line 107 "SetBackground.c"
 }
 
 
-SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
+SetBackgroundPhotoDialog*
+set_background_photo_dialog_new (void)
+{
 #line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 109 "SetBackground.c"
+#line 116 "SetBackground.c"
 }
 
 
-static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) {
+static void
+set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self)
+{
 	gboolean _tmp0_ = FALSE;
 	GtkCheckButton* _tmp1_;
 	gboolean _tmp2_;
@@ -126,7 +135,7 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD
 	if (_tmp3_) {
 #line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 		_tmp0_ = TRUE;
-#line 130 "SetBackground.c"
+#line 139 "SetBackground.c"
 	} else {
 		GtkCheckButton* _tmp4_;
 		gboolean _tmp5_;
@@ -139,59 +148,63 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD
 		_tmp6_ = _tmp5_;
 #line 24 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 		_tmp0_ = _tmp6_;
-#line 143 "SetBackground.c"
+#line 152 "SetBackground.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 147 "SetBackground.c"
+#line 156 "SetBackground.c"
 }
 
 
-static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+                                                                            gpointer self)
+{
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self);
-#line 154 "SetBackground.c"
+#line 166 "SetBackground.c"
 }
 
 
-gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver) {
+gboolean
+set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self,
+                                     gboolean* desktop_background,
+                                     gboolean* screensaver)
+{
 	gboolean _vala_desktop_background = FALSE;
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gint _tmp0_;
-	GtkCheckButton* _tmp1_;
+	GtkCheckButton* _tmp0_;
+	gboolean _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
-	GtkCheckButton* _tmp4_;
+	GtkCheckButton* _tmp3_;
+	gboolean _tmp4_;
 	gboolean _tmp5_;
-	gboolean _tmp6_;
 #line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
 #line 28 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.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 30 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp1_ = self->priv->desktop_background_checkbox;
+	_tmp0_ = self->priv->desktop_background_checkbox;
 #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_vala_desktop_background = _tmp3_;
+	_vala_desktop_background = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp4_ = self->priv->screensaver_checkbox;
+	_tmp3_ = self->priv->screensaver_checkbox;
 #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
-	_vala_screensaver = _tmp6_;
+	_vala_screensaver = _tmp5_;
 #line 35 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
@@ -200,21 +213,23 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
 	if (desktop_background) {
 #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 		*desktop_background = _vala_desktop_background;
-#line 204 "SetBackground.c"
+#line 217 "SetBackground.c"
 	}
 #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	if (screensaver) {
 #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 		*screensaver = _vala_screensaver;
-#line 210 "SetBackground.c"
+#line 223 "SetBackground.c"
 	}
 #line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	return result;
-#line 214 "SetBackground.c"
+#line 227 "SetBackground.c"
 }
 
 
-static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
+static void
+set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass)
+{
 	gint SetBackgroundPhotoDialog_private_offset;
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -232,20 +247,24 @@ static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClas
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox));
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.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 236 "SetBackground.c"
+#line 251 "SetBackground.c"
 }
 
 
-static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) {
+static void
+set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self)
+{
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self);
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 245 "SetBackground.c"
+#line 262 "SetBackground.c"
 }
 
 
-static void set_background_photo_dialog_finalize (GObject * obj) {
+static void
+set_background_photo_dialog_finalize (GObject * obj)
+{
 	SetBackgroundPhotoDialog * self;
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog);
@@ -255,11 +274,13 @@ static void set_background_photo_dialog_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->screensaver_checkbox);
 #line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
 	G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj);
-#line 259 "SetBackground.c"
+#line 278 "SetBackground.c"
 }
 
 
-GType set_background_photo_dialog_get_type (void) {
+GType
+set_background_photo_dialog_get_type (void)
+{
 	static volatile gsize set_background_photo_dialog_type_id__volatile = 0;
 	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 };