From: Juerg Billeter <j@bitron.ch>
Date: Sun, 16 Mar 2008 22:35:32 +0000 (+0000)
Subject: support modifying return type with metadata attributes
X-Git-Tag: VALA_0_2_0~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf2114702eb4bcb568690035808b79b855fd71a0;p=thirdparty%2Fvala.git

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 794b58c2d..2fb473490 100644
--- 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 d5f828e80..46d7c1fe6 100644
--- 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 bdad295f6..031d3a76e 100644
--- 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 20e950596..459481e25 100644
--- 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]));
 				}
 			}
 		}