Merge branch 'feature/upstream' into develop

1 files changed, 20 insertions, 14 deletions

diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 36ab376..48e5fab 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.36.6, the Vala compiler
+/* Direct.c generated by valac 0.40.4, the Vala compiler
  * generated from Direct.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15,6 +15,7 @@
  * the preconfigure() method, implement it, and ensure in init() that it's been called.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -36,31 +37,34 @@ void direct_terminate (void);
 void direct_photo_terminate (void);
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 43 "Direct.c"
+#line 46 "Direct.c"
 }
 
 
-void direct_preconfigure (GFile* initial_file) {
+void
+direct_preconfigure (GFile* initial_file)
+{
 	GFile* _tmp0_;
-	GFile* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/direct/Direct.vala"
 	g_return_if_fail (G_IS_FILE (initial_file));
 #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
-	_tmp0_ = initial_file;
-#line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (initial_file);
 #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
 	_g_object_unref0 (direct_initial_file);
 #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
-	direct_initial_file = _tmp1_;
-#line 60 "Direct.c"
+	direct_initial_file = _tmp0_;
+#line 62 "Direct.c"
 }
 
 
-void direct_init (GError** error) {
+void
+direct_init (GError** error)
+{
 	GFile* _tmp0_;
 	GFile* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/direct/Direct.vala"
@@ -71,14 +75,16 @@ void direct_init (GError** error) {
 	_tmp1_ = direct_initial_file;
 #line 27 "/home/jens/Source/shotwell/src/direct/Direct.vala"
 	direct_photo_init (_tmp1_);
-#line 75 "Direct.c"
+#line 79 "Direct.c"
 }
 
 
-void direct_terminate (void) {
+void
+direct_terminate (void)
+{
 #line 31 "/home/jens/Source/shotwell/src/direct/Direct.vala"
 	direct_photo_terminate ();
-#line 82 "Direct.c"
+#line 88 "Direct.c"
 }