don't ignore Gtk.Allocation, set cname of methods add Gtk.Allocation

2006-11-02  Jürg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala: don't ignore Gtk.Allocation, set cname
	  of methods
	* packages/gtk+-2.0/gtk+-2.0-custom.vala: add Gtk.Allocation struct

svn path=/trunk/; revision=165

diff --git a/vapigen/ChangeLog b/vapigen/ChangeLog
index 1ef7634dac4186ceaf0464e01b7ae4ed7fa36a34..c3bbe8bd21933b0677f2a1cea6e05721aee89d5e 100644 (file)
--- a/vapigen/ChangeLog
+++ b/vapigen/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-02  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/valagidlparser.vala: don't ignore Gtk.Allocation, set cname
+         of methods
+       * packages/gtk+-2.0/gtk+-2.0-custom.vala: add Gtk.Allocation struct
+
 2006-10-27  Jürg Billeter  <j@bitron.ch>
 
        * gidlgen/gapi2xml.pl: detect some array types in return types

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapigen/packages/gtk+-2.0/gtk+-2.0-custom.vala
index c480ffb65c2de622aa8bb450c9b7fbbcc6fa6622..8f327324a484f37a45aef03633de18481ed0dfdc 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -25,4 +25,11 @@ namespace Gtk {
        public void init (out string[] args);
        public void main ();
        public void main_quit ();
+
+       public struct Allocation {
+               public int x;
+               public int y;
+               public int width;
+               public int height;
+       }
 }

diff --git a/vapigen/vapigen/valagidlparser.vala b/vapigen/vapigen/valagidlparser.vala
index b9455cf168ee82463131da8341a33ced84d32d2b..fc55e0cef4f97798712d9672dc73c99f5fd40774 100644 (file)
--- a/vapigen/vapigen/valagidlparser.vala
+++ b/vapigen/vapigen/valagidlparser.vala
@@ -546,7 +546,7 @@ public class Vala.GIdlParser : CodeVisitor {
                } else if (n.has_prefix ("Gtk")) {
                        type.namespace_name = "Gtk";
                        type.type_name = n.offset ("Gtk".len ());
-                       if (type.type_name == "Allocation" || type.type_name == "TextLayout") {
+                       if (type.type_name == "TextLayout") {
                                type.namespace_name = null;
                                type.type_name = "pointer";
                        }
@@ -658,6 +658,8 @@ public class Vala.GIdlParser : CodeVisitor {
                        }
                }
                
+               m.set_cname (f.symbol);
+               
                bool first = true;
                foreach (IdlNodeParam param in f.parameters) {
                        var param_node = (IdlNode) param;