From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 17 Oct 2010 05:07:37 +0000 (-0700)
Subject: vapigen: Remove obsolete code for handling omitted --library option
X-Git-Tag: 0.11.2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e58d350311e61dc1690eac52a1a7fa2c6a69ffae;p=thirdparty%2Fvala.git

vapigen: Remove obsolete code for handling omitted --library option
---

diff --git a/vapigen/valavapigen.vala b/vapigen/valavapigen.vala
index a5cc9234f..a660c3633 100644
--- a/vapigen/valavapigen.vala
+++ b/vapigen/valavapigen.vala
@@ -159,31 +159,18 @@ class Vala.VAPIGen : Object {
 		if (context.report.get_errors () > 0) {
 			return quit ();
 		}
-		
-		if (library == null && girparser.get_package_names () != null) {
-			var names = girparser.get_package_names ();
 
-			if (names.length != 1) {
-				Report.error (null, "multiple packages encountered and no library name given");
-				return quit ();
+		// interface writer ignores external packages
+		foreach (SourceFile file in context.get_source_files ()) {
+			if (!file.filename.has_suffix (".vapi")) {
+				file.file_type = SourceFileType.SOURCE;
 			}
-
-			library = names[0];
 		}
 
-		if (library != null) {
-			// interface writer ignores external packages
-			foreach (SourceFile file in context.get_source_files ()) {
-				if (!file.filename.has_suffix (".vapi")) {
-					file.file_type = SourceFileType.SOURCE;
-				}
-	 		}
-
-			var interface_writer = new CodeWriter ();
-			interface_writer.write_file (context, "%s.vapi".printf (library));
+		var interface_writer = new CodeWriter ();
+		interface_writer.write_file (context, "%s.vapi".printf (library));
 			
-			library = null;
-		}
+		library = null;
 		
 		return quit ();
 	}