fix to_string for nullable delegates

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

svn path=/trunk/; revision=1266

diff --git a/ChangeLog b/ChangeLog
index 2b7e1f8..b1f128d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-04-19  Jürg 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
+
+2008-04-19  Jürg Billeter  <j@bitron.ch>
+
        * gobject/valaccodeassignmentbinding.vala,
          gobject/valaccodebinding.vala, gobject/valaccodeclassbinding.vala,
          gobject/valaccodemethodbinding.vala:

diff --git a/vala/valadelegatetype.vala b/vala/valadelegatetype.vala
index b0c908b..5fb96b0 100644 (file)
--- a/vala/valadelegatetype.vala
+++ b/vala/valadelegatetype.vala
@@ -46,7 +46,11 @@ public class Vala.DelegateType : DataType {
        }
 
        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 () {

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 8b1b6d9..ef738cc 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 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);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 58914d4..730c7a2 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -6,8 +6,10 @@ 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.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"