Merge branch 'feature/upstream' into develop

1 files changed, 63 insertions, 77 deletions

diff --git a/src/International.c b/src/International.c
index 422a7e4..01f33dd 100644
--- a/src/International.c
+++ b/src/International.c
@@ -1,4 +1,4 @@
-/* International.c generated by valac 0.36.6, the Vala compiler
+/* International.c generated by valac 0.40.4, the Vala compiler
  * generated from International.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>
@@ -23,135 +24,120 @@
 #define TRANSLATABLE "translatable"
 #define INTERNATIONAL_SUPPORT_SYSTEM_LOCALE ""
 #define INTERNATIONAL_SUPPORT_LANGUAGE_SUPPORT_DIRECTORY _LANG_SUPPORT_DIR
-void international_support_init (const gchar* package_name, gchar** args, int args_length1, const gchar* locale);
-gchar* international_support_get_langpack_dir_path (gchar** args, int args_length1);
+void international_support_init (const gchar* package_name,
+                                 gchar** args,
+                                 int args_length1,
+                                 const gchar* locale);
+gchar* international_support_get_langpack_dir_path (gchar** args,
+                                                    int args_length1);
 
 
-void international_support_init (const gchar* package_name, gchar** args, int args_length1, const gchar* locale) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar** _tmp2_;
-	gint _tmp2__length1;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
+void
+international_support_init (const gchar* package_name,
+                            gchar** args,
+                            int args_length1,
+                            const gchar* locale)
+{
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/International.vala"
 	g_return_if_fail (package_name != NULL);
 #line 15 "/home/jens/Source/shotwell/src/International.vala"
 	g_return_if_fail (locale != NULL);
 #line 16 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp0_ = locale;
-#line 16 "/home/jens/Source/shotwell/src/International.vala"
-	setlocale (LC_ALL, _tmp0_);
-#line 18 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp1_ = package_name;
+	setlocale (LC_ALL, locale);
 #line 18 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp2_ = args;
+	_tmp0_ = international_support_get_langpack_dir_path (args, args_length1);
 #line 18 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp2__length1 = args_length1;
-#line 18 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp3_ = international_support_get_langpack_dir_path (_tmp2_, _tmp2__length1);
-#line 18 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp4_ = _tmp3_;
+	_tmp1_ = _tmp0_;
 #line 18 "/home/jens/Source/shotwell/src/International.vala"
-	bindtextdomain (_tmp1_, _tmp4_);
+	bindtextdomain (package_name, _tmp1_);
 #line 18 "/home/jens/Source/shotwell/src/International.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp1_);
 #line 19 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp5_ = package_name;
-#line 19 "/home/jens/Source/shotwell/src/International.vala"
-	bind_textdomain_codeset (_tmp5_, "UTF-8");
-#line 20 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp6_ = package_name;
+	bind_textdomain_codeset (package_name, "UTF-8");
 #line 20 "/home/jens/Source/shotwell/src/International.vala"
-	textdomain (_tmp6_);
-#line 70 "International.c"
+	textdomain (package_name);
+#line 62 "International.c"
 }
 
 
-gchar* international_support_get_langpack_dir_path (gchar** args, int args_length1) {
+gchar*
+international_support_get_langpack_dir_path (gchar** args,
+                                             int args_length1)
+{
 	gchar* result = NULL;
 	GFile* local_langpack_dir = NULL;
-	gchar** _tmp0_;
-	gint _tmp0__length1;
-	const gchar* _tmp1_;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	gchar* _tmp3_;
+	GFile* _tmp3_;
 	GFile* _tmp4_;
 	GFile* _tmp5_;
 	GFile* _tmp6_;
 	GFile* _tmp7_;
 	GFile* _tmp8_;
-	GFile* _tmp9_;
-	gchar* _tmp10_ = NULL;
-	GFile* _tmp11_;
-	gboolean _tmp12_;
-#line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp0_ = args;
+	gchar* _tmp9_ = NULL;
+	GFile* _tmp10_;
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp0__length1 = args_length1;
+	_tmp0_ = args[0];
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp1_ = _tmp0_[0];
+	_tmp1_ = g_find_program_in_path (_tmp0_);
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp2_ = g_find_program_in_path (_tmp1_);
+	_tmp2_ = _tmp1_;
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp3_ = _tmp2_;
+	_tmp3_ = g_file_new_for_path (_tmp2_);
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp4_ = g_file_new_for_path (_tmp3_);
-#line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp6_ = g_file_get_parent (_tmp5_);
+	_tmp5_ = g_file_get_parent (_tmp4_);
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp8_ = g_file_get_child (_tmp7_, "locale-langpack");
+	_tmp7_ = g_file_get_child (_tmp6_, "locale-langpack");
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp4_);
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 24 "/home/jens/Source/shotwell/src/International.vala"
-	local_langpack_dir = _tmp9_;
-#line 28 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp11_ = local_langpack_dir;
+	local_langpack_dir = _tmp8_;
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
-	_tmp12_ = g_file_query_exists (_tmp11_, NULL);
+	_tmp10_ = local_langpack_dir;
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
-	if (_tmp12_) {
-#line 127 "International.c"
-		GFile* _tmp13_;
-		gchar* _tmp14_;
+	if (g_file_query_exists (_tmp10_, NULL)) {
+#line 113 "International.c"
+		GFile* _tmp11_;
+		gchar* _tmp12_;
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
-		_tmp13_ = local_langpack_dir;
+		_tmp11_ = local_langpack_dir;
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
-		_tmp14_ = g_file_get_path (_tmp13_);
+		_tmp12_ = g_file_get_path (_tmp11_);
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
-		_tmp10_ = _tmp14_;
-#line 138 "International.c"
+		_tmp9_ = _tmp12_;
+#line 124 "International.c"
 	} else {
-		gchar* _tmp15_;
+		gchar* _tmp13_;
 #line 29 "/home/jens/Source/shotwell/src/International.vala"
-		_tmp15_ = g_strdup (INTERNATIONAL_SUPPORT_LANGUAGE_SUPPORT_DIRECTORY);
+		_tmp13_ = g_strdup (INTERNATIONAL_SUPPORT_LANGUAGE_SUPPORT_DIRECTORY);
 #line 29 "/home/jens/Source/shotwell/src/International.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp9_);
 #line 29 "/home/jens/Source/shotwell/src/International.vala"
-		_tmp10_ = _tmp15_;
-#line 147 "International.c"
+		_tmp9_ = _tmp13_;
+#line 133 "International.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
-	result = _tmp10_;
+	result = _tmp9_;
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
 	_g_object_unref0 (local_langpack_dir);
 #line 28 "/home/jens/Source/shotwell/src/International.vala"
 	return result;
-#line 155 "International.c"
+#line 141 "International.c"
 }