From: Juerg Billeter <j@bitron.ch>
Date: Tue, 7 Aug 2007 08:22:59 +0000 (+0000)
Subject: fix Soup.HttpVersion enum
X-Git-Tag: VALA_0_1_3~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad7b17bb625929674cae1da7f37bf7fa0f58e7da;p=thirdparty%2Fvala.git

fix Soup.HttpVersion enum

2007-08-07  Juerg Billeter  <j@bitron.ch>

	* vapi/libsoup-2.2.vala, vapigen/valagidlparser.vala: fix
	  Soup.HttpVersion enum

svn path=/trunk/; revision=429
---

diff --git a/ChangeLog b/ChangeLog
index 59cd7102f..89adb2f6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-07  Jürg Billeter  <j@bitron.ch>
+
+	* vapi/libsoup-2.2.vala, vapigen/valagidlparser.vala: fix
+	  Soup.HttpVersion enum
+
 2007-08-07  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/Makefile.am: add libsoup-2.2.vala
diff --git a/vapi/libsoup-2.2.vala b/vapi/libsoup-2.2.vala
index 217198b05..54609b257 100644
--- a/vapi/libsoup-2.2.vala
+++ b/vapi/libsoup-2.2.vala
@@ -22,10 +22,10 @@ namespace Soup {
 		BODY_CHUNK,
 		POST_BODY,
 	}
-	[CCode (cprefix = "SOUP_HTTP_1_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_HTTP_", cheader_filename = "libsoup/soup.h")]
 	public enum HttpVersion {
-		0,
-		1,
+		1_0,
+		1_1,
 	}
 	[CCode (cprefix = "SOUP_STATUS_", cheader_filename = "libsoup/soup.h")]
 	public enum KnownStatusCode {
diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 0f227f0a0..4ac02ffe3 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -376,6 +376,11 @@ public class Vala.GIdlParser : CodeVisitor {
 					common_prefix = common_prefix.ndup (common_prefix.size () - 1);
 				}
 			}
+			while (common_prefix.len () > 0 && (!common_prefix.has_suffix ("_") ||
+			       (value.name.offset (common_prefix.size ()).get_char ().isdigit ()) && (value.name.len () - common_prefix.len ()) <= 1)) {
+				// enum values may not consist solely of digits
+				common_prefix = common_prefix.ndup (common_prefix.size () - 1);
+			}
 		}
 		
 		en.set_cprefix (common_prefix);