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 59cd7102f2c3a1b262793032728069714ad15360..89adb2f6fe948bf1ab39a530cf3e55b9dd328cb5 100644 (file)
--- 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 217198b05ca06dde548e83191b5a768909a2b417..54609b257332a093a0b13a8b928afff0ad97a47c 100644 (file)
--- 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 0f227f0a093a4b2b22bc2ad5f8e7d88683ea1bb0..4ac02ffe39d759bca255317d096032ee9c62d4f7 100644 (file)
--- 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);