Merge branch 'feature/upstream' into develop

1 files changed, 55 insertions, 58 deletions

diff --git a/src/util/system.c b/src/util/system.c
index 3075260..958256c 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.36.6, the Vala compiler
+/* system.c generated by valac 0.40.4, the Vala compiler
  * generated from system.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
  */
 /* Return the directory in which Shotwell is installed, or null if uninstalled.*/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -25,77 +26,73 @@
 GFile* get_sys_install_dir (GFile* exec_dir);
 #define RESOURCES_PREFIX _PREFIX
 gchar* get_nautilus_install_location (void);
-void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error);
-void show_file_in_nautilus (const gchar* filename, GError** error);
+void sys_show_uri (GdkScreen* screen,
+                   const gchar* uri,
+                   GError** error);
+void show_file_in_nautilus (const gchar* filename,
+                            GError** error);
 
 
-GFile* get_sys_install_dir (GFile* exec_dir) {
+GFile*
+get_sys_install_dir (GFile* exec_dir)
+{
 	GFile* result = NULL;
 	GFile* child = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
+	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
+	gboolean _tmp4_;
 #line 8 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_val_if_fail (G_IS_FILE (exec_dir), NULL);
 #line 10 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp0_ = exec_dir;
+	_tmp0_ = g_file_get_child (exec_dir, "ui");
 #line 10 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp1_ = g_file_get_child (_tmp0_, "ui");
-#line 10 "/home/jens/Source/shotwell/src/util/system.vala"
-	child = _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp2_ = child;
+	child = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp3_ = g_file_get_path (_tmp2_);
+	_tmp1_ = child;
 #line 12 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = g_file_get_path (_tmp1_);
 #line 12 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp5_ = g_file_test (_tmp4_, G_FILE_TEST_IS_DIR | G_FILE_TEST_EXISTS);
+	_tmp3_ = _tmp2_;
 #line 12 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp6_ = !_tmp5_;
+	_tmp4_ = !g_file_test (_tmp3_, G_FILE_TEST_IS_DIR | G_FILE_TEST_EXISTS);
 #line 12 "/home/jens/Source/shotwell/src/util/system.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 12 "/home/jens/Source/shotwell/src/util/system.vala"
-	if (_tmp6_) {
+	if (_tmp4_) {
 #line 65 "system.c"
-		GFile* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		gboolean _tmp10_;
-		GFile* _tmp11_;
-#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
-		_tmp7_ = exec_dir;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gboolean _tmp7_;
+		GFile* _tmp8_;
 #line 14 "/home/jens/Source/shotwell/src/util/system.vala"
-		_tmp8_ = g_file_get_basename (_tmp7_);
+		_tmp5_ = g_file_get_basename (exec_dir);
 #line 14 "/home/jens/Source/shotwell/src/util/system.vala"
-		_tmp9_ = _tmp8_;
+		_tmp6_ = _tmp5_;
 #line 14 "/home/jens/Source/shotwell/src/util/system.vala"
-		_tmp10_ = g_strcmp0 (_tmp9_, "src") == 0;
+		_tmp7_ = g_strcmp0 (_tmp6_, "src") == 0;
 #line 14 "/home/jens/Source/shotwell/src/util/system.vala"
-		_g_free0 (_tmp9_);
+		_g_free0 (_tmp6_);
 #line 14 "/home/jens/Source/shotwell/src/util/system.vala"
-		if (_tmp10_) {
+		if (_tmp7_) {
 #line 15 "/home/jens/Source/shotwell/src/util/system.vala"
 			result = NULL;
 #line 15 "/home/jens/Source/shotwell/src/util/system.vala"
 			_g_object_unref0 (child);
 #line 15 "/home/jens/Source/shotwell/src/util/system.vala"
 			return result;
-#line 89 "system.c"
+#line 86 "system.c"
 		}
 #line 18 "/home/jens/Source/shotwell/src/util/system.vala"
-		_tmp11_ = g_file_new_for_path (RESOURCES_PREFIX);
+		_tmp8_ = g_file_new_for_path (RESOURCES_PREFIX);
 #line 18 "/home/jens/Source/shotwell/src/util/system.vala"
-		result = _tmp11_;
+		result = _tmp8_;
 #line 18 "/home/jens/Source/shotwell/src/util/system.vala"
 		_g_object_unref0 (child);
 #line 18 "/home/jens/Source/shotwell/src/util/system.vala"
 		return result;
-#line 99 "system.c"
+#line 96 "system.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	result = NULL;
@@ -103,11 +100,13 @@ GFile* get_sys_install_dir (GFile* exec_dir) {
 	_g_object_unref0 (child);
 #line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	return result;
-#line 107 "system.c"
+#line 104 "system.c"
 }
 
 
-gchar* get_nautilus_install_location (void) {
+gchar*
+get_nautilus_install_location (void)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -116,43 +115,43 @@ gchar* get_nautilus_install_location (void) {
 	result = _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/util/system.vala"
 	return result;
-#line 120 "system.c"
+#line 119 "system.c"
 }
 
 
-void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) {
-	GdkScreen* _tmp0_;
-	const gchar* _tmp1_;
+void
+sys_show_uri (GdkScreen* screen,
+              const gchar* uri,
+              GError** error)
+{
 	GError * _inner_error_ = NULL;
 #line 28 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
 #line 28 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (uri != NULL);
 #line 29 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp0_ = screen;
-#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp1_ = uri;
-#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
-	gtk_show_uri (_tmp0_, _tmp1_, (guint32) GDK_CURRENT_TIME, &_inner_error_);
+	gtk_show_uri (screen, uri, (guint32) GDK_CURRENT_TIME, &_inner_error_);
 #line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 		g_propagate_error (error, _inner_error_);
 #line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 		return;
-#line 144 "system.c"
+#line 141 "system.c"
 	}
 }
 
 
-void show_file_in_nautilus (const gchar* filename, GError** error) {
+void
+show_file_in_nautilus (const gchar* filename,
+                       GError** error)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-	const gchar* _tmp4_;
+	gchar* _tmp4_;
 	gchar* _tmp5_;
-	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 32 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (filename != NULL);
@@ -165,15 +164,13 @@ void show_file_in_nautilus (const gchar* filename, GError** error) {
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp3_ = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp4_ = filename;
-#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
+	_tmp4_ = g_strconcat (_tmp3_, filename, NULL);
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
-	g_spawn_command_line_async (_tmp6_, &_inner_error_);
+	g_spawn_command_line_async (_tmp5_, &_inner_error_);
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp5_);
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_free0 (_tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -184,7 +181,7 @@ void show_file_in_nautilus (const gchar* filename, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 		return;
-#line 188 "system.c"
+#line 185 "system.c"
 	}
 }