fix duplicate local variable, patch by Vlad Grecescu

2008-03-04  Juerg Billeter  <j@bitron.ch>

	* vala/valacodecontext.vala: fix duplicate local variable,
	  patch by Vlad Grecescu

svn path=/trunk/; revision=1100

diff --git a/ChangeLog b/ChangeLog
index 293efb1..43a95da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-03-04  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valacodecontext.vala: fix duplicate local variable,
+         patch by Vlad Grecescu
+
+2008-03-04  Jürg Billeter  <j@bitron.ch>
+
        * vapi/glib-2.0.vapi: fix GBase64 bindings
 
 2008-03-04  Jürg Billeter  <j@bitron.ch>

diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index 241c74d..74a6d3e 100644 (file)
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -387,23 +387,24 @@ public class Vala.CodeContext : Object {
 
        public string get_package_path (string! pkg, [CCode (array_length_pos = 1.9)] string[] vapi_directories) {
                string basename = "%s.vapi".printf (pkg);
+               string filename = null;
 
                if (vapi_directories != null) {
                        foreach (string vapidir in vapi_directories) {
-                               var filename = Path.build_filename (vapidir, basename);
+                               filename = Path.build_filename (vapidir, basename);
                                if (FileUtils.test (filename, FileTest.EXISTS)) {
                                        return filename;
                                }
                        }
                }
 
-               string filename = Path.build_filename (Config.PACKAGE_DATADIR, "vapi", basename);
+               filename = Path.build_filename (Config.PACKAGE_DATADIR, "vapi", basename);
                if (FileUtils.test (filename, FileTest.EXISTS)) {
                        return filename;
                }
 
                foreach (string vapidir in Environment.get_system_data_dirs ()) {
-                       var filename = Path.build_filename (vapidir, "vala/vapi", basename);
+                       filename = Path.build_filename (vapidir, "vala/vapi", basename);
                        if (FileUtils.test (filename, FileTest.EXISTS)) {
                                return filename;
                        }