support modifying return type with metadata attributes

2008-03-16  Juerg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala: support modifying return type with
	  metadata attributes

	* vapi/packages/gtk+-2.0/: fix gtk_about_dialog_set_*_hook bindings,
	  fixes bug 522061

	* vapi/gtk+-2.0.vapi: regenerated

svn path=/trunk/; revision=1133

diff --git a/ChangeLog b/ChangeLog
index 794b58c2d33bfd56e16d3cf43ee489efad64ae8f..2fb473490aa0f0a2ad8e50d5c25a20557c568e89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-16  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/valagidlparser.vala: support modifying return type with
+         metadata attributes
+
+       * vapi/packages/gtk+-2.0/: fix gtk_about_dialog_set_*_hook bindings,
+         fixes bug 522061
+
+       * vapi/gtk+-2.0.vapi: regenerated
+
 2008-03-16  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodegenerator.vala,

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index d5f828e8032c0f8416d87ae0749b47c18d66567e..46d7c1fe67d0a47170ea5499ed2da80f3423fc96 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -1676,13 +1676,13 @@ namespace Gtk {
                public void set_copyright (string copyright);
                [NoArrayLength]
                public void set_documenters (string[] documenters);
-               public static Gtk.AboutDialogActivateLinkFunc set_email_hook (Gtk.AboutDialogActivateLinkFunc func, pointer data, GLib.DestroyNotify destroy);
+               public static void set_email_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify destroy);
                public void set_license (string license);
                public void set_logo (Gdk.Pixbuf logo);
                public void set_logo_icon_name (string icon_name);
                public void set_program_name (string name);
                public void set_translator_credits (string translator_credits);
-               public static Gtk.AboutDialogActivateLinkFunc set_url_hook (Gtk.AboutDialogActivateLinkFunc func, pointer data, GLib.DestroyNotify destroy);
+               public static void set_url_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify destroy);
                public void set_version (string version);
                public void set_website (string website);
                public void set_website_label (string website_label);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index bdad295f6c14cda9ea3fe7d23a9c8b3be5ce19f1..031d3a76e3ec12a8ef5121054fdbc4f8aa427644 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -5,6 +5,10 @@ gtk_about_dialog_set_authors no_array_length="1"
 gtk_about_dialog_set_authors.authors is_array="1" no_array_length="1"
 gtk_about_dialog_set_documenters no_array_length="1"
 gtk_about_dialog_set_documenters.documenters is_array="1" no_array_length="1"
+gtk_about_dialog_set_email_hook.data hidden="1"
+gtk_about_dialog_set_email_hook type_name="void"
+gtk_about_dialog_set_url_hook.data hidden="1"
+gtk_about_dialog_set_url_hook type_name="void"
 gtk_accelerator_parse.accelerator_key is_out="1"
 gtk_accelerator_parse.accelerator_mods is_out="1"
 GtkAction::activate has_emitter="1"

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 20e950596ea51c3e298071d74cee4b3e518dc37d..459481e255f7f497a0c929410c394dc4a92b251d 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1254,6 +1254,8 @@ public class Vala.GIdlParser : CodeVisitor {
                                        if (eval (nv[1]) == "1") {
                                                m.no_array_length = true;
                                        }
+                               } else if (nv[0] == "type_name") {
+                                       return_type.unresolved_symbol = new UnresolvedSymbol (null, eval (nv[1]));
                                }
                        }
                }