vala r1100 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Tue Mar  4 20:24:02 2008
New Revision: 1100
URL: http://svn.gnome.org/viewvc/vala?rev=1100&view=rev

Log:
2008-03-04  Juerg Billeter  <j bitron ch>

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


Modified:
   trunk/ChangeLog
   trunk/vala/valacodecontext.vala

Modified: trunk/vala/valacodecontext.vala
==============================================================================
--- trunk/vala/valacodecontext.vala	(original)
+++ trunk/vala/valacodecontext.vala	Tue Mar  4 20:24:02 2008
@@ -387,23 +387,24 @@
 
 	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;
 			}