vala r1266 - in trunk: . vala vapi vapi/packages/gtk+-2.0

[juergbi svn gnome org]

Author: juergbi
Date: Sat Apr 19 08:44:10 2008
New Revision: 1266
URL: http://svn.gnome.org/viewvc/vala?rev=1266&view=rev

Log:
2008-04-19  Juerg Billeter  <j bitron ch>

	* vala/valadelegatetype.vala: fix to_string for nullable delegates

	* vapi/packages/gtk+-2.0/: fix gtk_about_dialog_set_*_hook
	  bindings, patch by Jaap A. Haitsma, fixes bug 528674

	* vapi/gtk+-2.0.vapi: regenerated


Modified:
   trunk/ChangeLog
   trunk/vala/valadelegatetype.vala
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata

Modified: trunk/vala/valadelegatetype.vala
==============================================================================
--- trunk/vala/valadelegatetype.vala	(original)
+++ trunk/vala/valadelegatetype.vala	Sat Apr 19 08:44:10 2008
@@ -46,7 +46,11 @@
 	}
 
 	public override string to_string () {
-		return delegate_symbol.get_full_name ();
+		string s = delegate_symbol.get_full_name ();
+		if (nullable) {
+			s += "?";
+		}
+		return s;
 	}
 
 	public override DataType copy () {

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Sat Apr 19 08:44:10 2008
@@ -1676,13 +1676,13 @@
 		public void set_copyright (string copyright);
 		[NoArrayLength]
 		public void set_documenters (string[] documenters);
-		public static void set_email_hook (Gtk.AboutDialogActivateLinkFunc func, 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 void set_url_hook (Gtk.AboutDialogActivateLinkFunc func, 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);

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	Sat Apr 19 08:44:10 2008
@@ -6,8 +6,10 @@
 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.destroy nullable="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.destroy nullable="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"