Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 52 insertions, 55 deletions

diff --git a/src/Screensaver.c b/src/Screensaver.c
index 3912c48..da25d5f 100644
--- a/src/Screensaver.c
+++ b/src/Screensaver.c
@@ -1,4 +1,4 @@
-/* Screensaver.c generated by valac 0.34.7, the Vala compiler
+/* Screensaver.c generated by valac 0.36.6, the Vala compiler
  * generated from Screensaver.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -86,7 +86,7 @@ Application* application_get_instance (void);
 guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, const gchar* reason);
 void screensaver_uninhibit (Screensaver* self);
 void application_uninhibit (Application* self, guint cookie);
-static void screensaver_finalize (Screensaver* obj);
+static void screensaver_finalize (Screensaver * obj);
 
 
 Screensaver* screensaver_construct (GType object_type) {
@@ -107,11 +107,10 @@ Screensaver* screensaver_new (void) {
 
 
 void screensaver_inhibit (Screensaver* self, const gchar* reason) {
-	guint32 _tmp0_ = 0U;
-	Application* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
+	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"
@@ -122,29 +121,27 @@ void screensaver_inhibit (Screensaver* self, const gchar* reason) {
 	if (_tmp0_ != ((guint32) 0)) {
 #line 15 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return;
-#line 126 "Screensaver.c"
+#line 125 "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_ = _ ("Slideshow");
+	_tmp3_ = application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _ ("Slideshow"));
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
-	_tmp4_ = application_inhibit (_tmp2_, GTK_APPLICATION_INHIBIT_IDLE | GTK_APPLICATION_INHIBIT_SUSPEND, _tmp3_);
-#line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
-	self->priv->cookie = (guint32) _tmp4_;
+	self->priv->cookie = (guint32) _tmp3_;
 #line 17 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_application_unref0 (_tmp2_);
-#line 140 "Screensaver.c"
+#line 137 "Screensaver.c"
 }
 
 
 void screensaver_uninhibit (Screensaver* self) {
-	guint32 _tmp0_ = 0U;
-	Application* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
-	guint32 _tmp3_ = 0U;
+	guint32 _tmp0_;
+	Application* _tmp1_;
+	Application* _tmp2_;
+	guint32 _tmp3_;
 #line 21 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (IS_SCREENSAVER (self));
 #line 22 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -153,7 +150,7 @@ void screensaver_uninhibit (Screensaver* self) {
 	if (_tmp0_ == ((guint32) 0)) {
 #line 23 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		return;
-#line 157 "Screensaver.c"
+#line 154 "Screensaver.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	_tmp1_ = application_get_instance ();
@@ -167,14 +164,14 @@ void screensaver_uninhibit (Screensaver* self) {
 	_application_unref0 (_tmp2_);
 #line 26 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->priv->cookie = (guint32) 0;
-#line 171 "Screensaver.c"
+#line 168 "Screensaver.c"
 }
 
 
 static void value_screensaver_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	value->data[0].v_pointer = NULL;
-#line 178 "Screensaver.c"
+#line 175 "Screensaver.c"
 }
 
 
@@ -183,7 +180,7 @@ static void value_screensaver_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		screensaver_unref (value->data[0].v_pointer);
-#line 187 "Screensaver.c"
+#line 184 "Screensaver.c"
 	}
 }
 
@@ -193,11 +190,11 @@ static void value_screensaver_copy_value (const GValue* src_value, GValue* dest_
 	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 197 "Screensaver.c"
+#line 194 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 201 "Screensaver.c"
+#line 198 "Screensaver.c"
 	}
 }
 
@@ -205,66 +202,66 @@ static void value_screensaver_copy_value (const GValue* src_value, GValue* dest_
 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 209 "Screensaver.c"
+#line 206 "Screensaver.c"
 }
 
 
 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 216 "Screensaver.c"
-		Screensaver* object;
+#line 213 "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 223 "Screensaver.c"
+#line 220 "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 227 "Screensaver.c"
+#line 224 "Screensaver.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = screensaver_ref (object);
-#line 231 "Screensaver.c"
+#line 228 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 235 "Screensaver.c"
+#line 232 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return NULL;
-#line 239 "Screensaver.c"
+#line 236 "Screensaver.c"
 }
 
 
 static gchar* value_screensaver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Screensaver** object_p;
+	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 250 "Screensaver.c"
+#line 247 "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 256 "Screensaver.c"
+#line 253 "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 260 "Screensaver.c"
+#line 257 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		*object_p = screensaver_ref (value->data[0].v_pointer);
-#line 264 "Screensaver.c"
+#line 261 "Screensaver.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	return NULL;
-#line 268 "Screensaver.c"
+#line 265 "Screensaver.c"
 }
 
 
@@ -278,7 +275,7 @@ 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 282 "Screensaver.c"
+#line 279 "Screensaver.c"
 }
 
 
@@ -287,12 +284,12 @@ gpointer value_get_screensaver (const GValue* value) {
 	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 291 "Screensaver.c"
+#line 288 "Screensaver.c"
 }
 
 
 void value_set_screensaver (GValue* value, gpointer v_object) {
-	Screensaver* old;
+	Screensaver * old;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER));
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -307,23 +304,23 @@ 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 311 "Screensaver.c"
+#line 308 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 315 "Screensaver.c"
+#line 312 "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 321 "Screensaver.c"
+#line 318 "Screensaver.c"
 	}
 }
 
 
 void value_take_screensaver (GValue* value, gpointer v_object) {
-	Screensaver* old;
+	Screensaver * old;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCREENSAVER));
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
@@ -336,17 +333,17 @@ 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 340 "Screensaver.c"
+#line 337 "Screensaver.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 		value->data[0].v_pointer = NULL;
-#line 344 "Screensaver.c"
+#line 341 "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 350 "Screensaver.c"
+#line 347 "Screensaver.c"
 	}
 }
 
@@ -358,7 +355,7 @@ static void screensaver_class_init (ScreensaverClass * klass) {
 	((ScreensaverClass *) klass)->finalize = screensaver_finalize;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	g_type_class_add_private (klass, sizeof (ScreensaverPrivate));
-#line 362 "Screensaver.c"
+#line 359 "Screensaver.c"
 }
 
 
@@ -369,17 +366,17 @@ static void screensaver_instance_init (Screensaver * self) {
 	self->priv->cookie = (guint32) 0;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	self->ref_count = 1;
-#line 373 "Screensaver.c"
+#line 370 "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 383 "Screensaver.c"
+#line 380 "Screensaver.c"
 }
 
 
@@ -398,18 +395,18 @@ GType screensaver_get_type (void) {
 
 
 gpointer screensaver_ref (gpointer instance) {
-	Screensaver* self;
+	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 408 "Screensaver.c"
+#line 405 "Screensaver.c"
 }
 
 
 void screensaver_unref (gpointer instance) {
-	Screensaver* self;
+	Screensaver * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/Screensaver.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -417,7 +414,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 421 "Screensaver.c"
+#line 418 "Screensaver.c"
 	}
 }