2005-01-31 Mike Kestner <mkestner@novell.com>

* gnome/About.custom : fix some nullterm issues in subclass 
	construction as reported on irc by latexer.

svn path=/trunk/gtk-sharp/; revision=56363
This commit is contained in:
Mike Kestner 2006-01-31 20:56:51 +00:00
parent f47b4880f1
commit 6edc0b8b89
2 changed files with 12 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2005-01-31 Mike Kestner <mkestner@novell.com>
* gnome/About.custom : fix some nullterm issues in subclass
construction as reported on irc by latexer.
2005-01-31 Mike Kestner <mkestner@novell.com> 2005-01-31 Mike Kestner <mkestner@novell.com>
* gtk/Dialog.custom : null check a parent arg. [Fixes #77400] * gtk/Dialog.custom : null check a parent arg. [Fixes #77400]

View file

@ -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) 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 nname = GLib.Marshaller.StringToPtrGStrdup (name);
IntPtr nversion = GLib.Marshaller.StringToPtrGStrdup (version); IntPtr nversion = GLib.Marshaller.StringToPtrGStrdup (version);
IntPtr ncopyright = GLib.Marshaller.StringToPtrGStrdup (copyright); IntPtr ncopyright = GLib.Marshaller.StringToPtrGStrdup (copyright);
@ -58,7 +53,13 @@
IntPtr ntranslator_credits = GLib.Marshaller.StringToPtrGStrdup (translator_credits); IntPtr ntranslator_credits = GLib.Marshaller.StringToPtrGStrdup (translator_credits);
IntPtr[] nauthors = NullTerm (authors); IntPtr[] nauthors = NullTerm (authors);
IntPtr[] ndocumenters = NullTerm (documenters); 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 (nname);
GLib.Marshaller.Free (nversion); GLib.Marshaller.Free (nversion);
GLib.Marshaller.Free (ncopyright); GLib.Marshaller.Free (ncopyright);