From 6edc0b8b89ee213c756c89116492e062bf253b6b Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 31 Jan 2006 20:56:51 +0000 Subject: [PATCH] 2005-01-31 Mike Kestner * gnome/About.custom : fix some nullterm issues in subclass construction as reported on irc by latexer. svn path=/trunk/gtk-sharp/; revision=56363 --- ChangeLog | 5 +++++ gnome/About.custom | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2af07c40a..ad44345be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-31 Mike Kestner + + * gnome/About.custom : fix some nullterm issues in subclass + construction as reported on irc by latexer. + 2005-01-31 Mike Kestner * gtk/Dialog.custom : null check a parent arg. [Fixes #77400] diff --git a/gnome/About.custom b/gnome/About.custom index 1d4de90d8..9b16ca29a 100644 --- a/gnome/About.custom +++ b/gnome/About.custom @@ -46,11 +46,6 @@ public About (string name, string version, string copyright, string comments, string[] authors, string[] documenters, string translator_credits, Gdk.Pixbuf logo_pixbuf) : base (IntPtr.Zero) { - if (GetType () != typeof (About)) { - CreateNativeObject (new string[0], new GLib.Value[0]); - Construct (name, version, copyright, comments, authors, documenters,translator_credits, logo_pixbuf); - return; - } IntPtr nname = GLib.Marshaller.StringToPtrGStrdup (name); IntPtr nversion = GLib.Marshaller.StringToPtrGStrdup (version); IntPtr ncopyright = GLib.Marshaller.StringToPtrGStrdup (copyright); @@ -58,7 +53,13 @@ IntPtr ntranslator_credits = GLib.Marshaller.StringToPtrGStrdup (translator_credits); IntPtr[] nauthors = NullTerm (authors); IntPtr[] ndocumenters = NullTerm (documenters); - Raw = gnome_about_new (nname, nversion, ncopyright, ncomments, nauthors, ndocumenters, ntranslator_credits, (logo_pixbuf != null) ? logo_pixbuf.Handle : IntPtr.Zero); + + if (GetType () != typeof (About)) { + CreateNativeObject (new string[0], new GLib.Value[0]); + gnome_about_construct (Handle, nname, nversion, ncopyright, ncomments, nauthors, ndocumenters, ntranslator_credits, logo_pixbuf == null ? IntPtr.Zero : logo_pixbuf.Handle); + } else + Raw = gnome_about_new (nname, nversion, ncopyright, ncomments, nauthors, ndocumenters, ntranslator_credits, (logo_pixbuf != null) ? logo_pixbuf.Handle : IntPtr.Zero); + GLib.Marshaller.Free (nname); GLib.Marshaller.Free (nversion); GLib.Marshaller.Free (ncopyright);