From 33849fd08576c6189709fa51f5a491679897130b Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Mon, 12 Jan 2009 22:15:47 +0000
Subject: [PATCH] 2009-01-09  Mike Kestner  <mkestner@novell.com>

	* glib/Opaque.cs (GetOpaque): return null for IntPtr.Zero.

svn path=/trunk/gtk-sharp/; revision=123140
---
 ChangeLog      | 4 ++++
 glib/Opaque.cs | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index eb4dd67f9..e07b6e08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-09  Mike Kestner  <mkestner@novell.com>
+
+	* glib/Opaque.cs (GetOpaque): return null for IntPtr.Zero.
+
 2009-01-09  Mike Kestner  <mkestner@novell.com>
 
 	* configure.in.in: don't hardcode CC when cross-compiling.
diff --git a/glib/Opaque.cs b/glib/Opaque.cs
index 4258d56b6..b4e463dc2 100644
--- a/glib/Opaque.cs
+++ b/glib/Opaque.cs
@@ -44,6 +44,9 @@ namespace GLib {
 
 		public static Opaque GetOpaque (IntPtr o, Type type, bool owned)
 		{
+			if (o == IntPtr.Zero)
+				return null;
+
 			Opaque opaque = (Opaque)Activator.CreateInstance (type, new object[] { o });
 			if (owned) {
 				if (opaque.owned) {