Merge branch 'release/0.28.3-1'0.28.3-1

1 files changed, 137 insertions, 72 deletions

diff --git a/src/Screensaver.c b/src/Screensaver.c
index da25d5f..f397c01 100644
--- a/src/Screensaver.c
+++ b/src/Screensaver.c
@@ -1,4 +1,4 @@
-/* Screensaver.c generated by valac 0.36.6, the Vala compiler
+/* Screensaver.c generated by valac 0.40.4, the Vala compiler
  * generated from Screensaver.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -63,54 +64,73 @@ static gpointer screensaver_parent_class = NULL;
 
 gpointer screensaver_ref (gpointer instance);
 void screensaver_unref (gpointer instance);
-GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_screensaver (GValue* value, gpointer v_object);
-void value_take_screensaver (GValue* value, gpointer v_object);
+GParamSpec* param_spec_screensaver (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_screensaver (GValue* value,
+                            gpointer v_object);
+void value_take_screensaver (GValue* value,
+                             gpointer v_object);
 gpointer value_get_screensaver (const GValue* value);
 GType screensaver_get_type (void) G_GNUC_CONST;
 #define SCREENSAVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SCREENSAVER, ScreensaverPrivate))
-enum  {
-	SCREENSAVER_DUMMY_PROPERTY
-};
 Screensaver* screensaver_new (void);
 Screensaver* screensaver_construct (GType object_type);
-void screensaver_inhibit (Screensaver* self, const gchar* reason);
+void screensaver_inhibit (Screensaver* self,
+                          const gchar* reason);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
+GParamSpec* param_spec_application (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_application (GValue* value,
+                            gpointer v_object);
+void value_take_application (GValue* value,
+                             gpointer v_object);
 gpointer value_get_application (const GValue* value);
 GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
-guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason);
+guint application_inhibit (Application* self,
+                           GtkApplicationInhibitFlags what,
+                           const gchar* reason);
 void screensaver_uninhibit (Screensaver* self);
-void application_uninhibit (Application* self, guint cookie);
+void application_uninhibit (Application* self,
+                            guint cookie);
 static void screensaver_finalize (Screensaver * obj);
 
 
-Screensaver* screensaver_construct (GType object_type) {
+Screensaver*
+screensaver_construct (GType object_type)
+{
 	Screensaver* self = NULL;
 #line 10 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self = (Screensaver*) g_type_create_instance (object_type);
 #line 10 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return self;
-#line 99 "Screensaver.c"
+#line 115 "Screensaver.c"
 }
 
 
-Screensaver* screensaver_new (void) {
+Screensaver*
+screensaver_new (void)
+{
 #line 10 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return screensaver_construct (TYPE_SCREENSAVER);
-#line 106 "Screensaver.c"
+#line 124 "Screensaver.c"
 }
 
 
-void screensaver_inhibit (Screensaver* self, const gchar* reason) {
+void
+screensaver_inhibit (Screensaver* self,
+                     const gchar* reason)
+{
 	guint32 _tmp0_;
 	Application* _tmp1_;
 	Application* _tmp2_;
-	guint _tmp3_;
 #line 13 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (IS_SCREENSAVER (self));
 #line 13 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -121,23 +141,23 @@ void screensaver_inhibit (Screensaver* self, const gchar* reason) {
 	if (_tmp0_ != ((guint32) 0)) {
 #line 15 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return;
-#line 125 "Screensaver.c"
+#line 145 "Screensaver.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_tmp1_ = application_get_instance ();
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_tmp2_ = _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
-	_tmp3_ = application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _ ("Slideshow"));
-#line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
-	self->priv->cookie = (guint32) _tmp3_;
+	self->priv->cookie = (guint32) application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _ ("Slideshow"));
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_application_unref0 (_tmp2_);
-#line 137 "Screensaver.c"
+#line 155 "Screensaver.c"
 }
 
 
-void screensaver_uninhibit (Screensaver* self) {
+void
+screensaver_uninhibit (Screensaver* self)
+{
 	guint32 _tmp0_;
 	Application* _tmp1_;
 	Application* _tmp2_;
@@ -150,7 +170,7 @@ void screensaver_uninhibit (Screensaver* self) {
 	if (_tmp0_ == ((guint32) 0)) {
 #line 23 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return;
-#line 154 "Screensaver.c"
+#line 174 "Screensaver.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_tmp1_ = application_get_instance ();
@@ -164,108 +184,133 @@ void screensaver_uninhibit (Screensaver* self) {
 	_application_unref0 (_tmp2_);
 #line 26 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->priv->cookie = (guint32) 0;
-#line 168 "Screensaver.c"
+#line 188 "Screensaver.c"
 }
 
 
-static void value_screensaver_init (GValue* value) {
+static void
+value_screensaver_init (GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	value->data[0].v_pointer = NULL;
-#line 175 "Screensaver.c"
+#line 197 "Screensaver.c"
 }
 
 
-static void value_screensaver_free_value (GValue* value) {
+static void
+value_screensaver_free_value (GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_unref (value->data[0].v_pointer);
-#line 184 "Screensaver.c"
+#line 208 "Screensaver.c"
 	}
 }
 
 
-static void value_screensaver_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_screensaver_copy_value (const GValue* src_value,
+                              GValue* dest_value)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		dest_value->data[0].v_pointer = screensaver_ref (src_value->data[0].v_pointer);
-#line 194 "Screensaver.c"
+#line 221 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 198 "Screensaver.c"
+#line 225 "Screensaver.c"
 	}
 }
 
 
-static gpointer value_screensaver_peek_pointer (const GValue* value) {
+static gpointer
+value_screensaver_peek_pointer (const GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return value->data[0].v_pointer;
-#line 206 "Screensaver.c"
+#line 235 "Screensaver.c"
 }
 
 
-static gchar* value_screensaver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_screensaver_collect_value (GValue* value,
+                                 guint n_collect_values,
+                                 GTypeCValue* collect_values,
+                                 guint collect_flags)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (collect_values[0].v_pointer) {
-#line 213 "Screensaver.c"
+#line 247 "Screensaver.c"
 		Screensaver * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 220 "Screensaver.c"
+#line 254 "Screensaver.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.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 224 "Screensaver.c"
+#line 258 "Screensaver.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = screensaver_ref (object);
-#line 228 "Screensaver.c"
+#line 262 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 232 "Screensaver.c"
+#line 266 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return NULL;
-#line 236 "Screensaver.c"
+#line 270 "Screensaver.c"
 }
 
 
-static gchar* value_screensaver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_screensaver_lcopy_value (const GValue* value,
+                               guint n_collect_values,
+                               GTypeCValue* collect_values,
+                               guint collect_flags)
+{
 	Screensaver ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 247 "Screensaver.c"
+#line 286 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		*object_p = NULL;
-#line 253 "Screensaver.c"
+#line 292 "Screensaver.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		*object_p = value->data[0].v_pointer;
-#line 257 "Screensaver.c"
+#line 296 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		*object_p = screensaver_ref (value->data[0].v_pointer);
-#line 261 "Screensaver.c"
+#line 300 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return NULL;
-#line 265 "Screensaver.c"
+#line 304 "Screensaver.c"
 }
 
 
-GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_screensaver (const gchar* name,
+                        const gchar* nick,
+                        const gchar* blurb,
+                        GType object_type,
+                        GParamFlags flags)
+{
 	ParamSpecScreensaver* spec;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCREENSAVER), NULL);
@@ -275,20 +320,25 @@ GParamSpec* param_spec_screensaver (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return G_PARAM_SPEC (spec);
-#line 279 "Screensaver.c"
+#line 324 "Screensaver.c"
 }
 
 
-gpointer value_get_screensaver (const GValue* value) {
+gpointer
+value_get_screensaver (const GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return value->data[0].v_pointer;
-#line 288 "Screensaver.c"
+#line 335 "Screensaver.c"
 }
 
 
-void value_set_screensaver (GValue* value, gpointer v_object) {
+void
+value_set_screensaver (GValue* value,
+                       gpointer v_object)
+{
 	Screensaver * old;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER));
@@ -304,22 +354,25 @@ void value_set_screensaver (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_ref (value->data[0].v_pointer);
-#line 308 "Screensaver.c"
+#line 358 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 312 "Screensaver.c"
+#line 362 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_unref (old);
-#line 318 "Screensaver.c"
+#line 368 "Screensaver.c"
 	}
 }
 
 
-void value_take_screensaver (GValue* value, gpointer v_object) {
+void
+value_take_screensaver (GValue* value,
+                        gpointer v_object)
+{
 	Screensaver * old;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER));
@@ -333,54 +386,62 @@ void value_take_screensaver (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = v_object;
-#line 337 "Screensaver.c"
+#line 390 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 341 "Screensaver.c"
+#line 394 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_unref (old);
-#line 347 "Screensaver.c"
+#line 400 "Screensaver.c"
 	}
 }
 
 
-static void screensaver_class_init (ScreensaverClass * klass) {
+static void
+screensaver_class_init (ScreensaverClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	screensaver_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	((ScreensaverClass *) klass)->finalize = screensaver_finalize;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_type_class_add_private (klass, sizeof (ScreensaverPrivate));
-#line 359 "Screensaver.c"
+#line 414 "Screensaver.c"
 }
 
 
-static void screensaver_instance_init (Screensaver * self) {
+static void
+screensaver_instance_init (Screensaver * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->priv = SCREENSAVER_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->priv->cookie = (guint32) 0;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->ref_count = 1;
-#line 370 "Screensaver.c"
+#line 427 "Screensaver.c"
 }
 
 
-static void screensaver_finalize (Screensaver * obj) {
+static void
+screensaver_finalize (Screensaver * obj)
+{
 	Screensaver * self;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCREENSAVER, Screensaver);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_signal_handlers_destroy (self);
-#line 380 "Screensaver.c"
+#line 439 "Screensaver.c"
 }
 
 
-GType screensaver_get_type (void) {
+GType
+screensaver_get_type (void)
+{
 	static volatile gsize screensaver_type_id__volatile = 0;
 	if (g_once_init_enter (&screensaver_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_screensaver_init, value_screensaver_free_value, value_screensaver_copy_value, value_screensaver_peek_pointer, "p", value_screensaver_collect_value, "p", value_screensaver_lcopy_value };
@@ -394,18 +455,22 @@ GType screensaver_get_type (void) {
 }
 
 
-gpointer screensaver_ref (gpointer instance) {
+gpointer
+screensaver_ref (gpointer instance)
+{
 	Screensaver * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return instance;
-#line 405 "Screensaver.c"
+#line 468 "Screensaver.c"
 }
 
 
-void screensaver_unref (gpointer instance) {
+void
+screensaver_unref (gpointer instance)
+{
 	Screensaver * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -414,7 +479,7 @@ void screensaver_unref (gpointer instance) {
 		SCREENSAVER_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 418 "Screensaver.c"
+#line 483 "Screensaver.c"
 	}
 }