From 6506bcb5cc896be07834f15a0fcc8643e8c380e2 Mon Sep 17 00:00:00 2001
From: Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Date: Mon, 17 Nov 2003 18:54:07 +0000
Subject: [PATCH] 2003-11-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* gdk/Pixbuf.custom:
	(LoadResource (assembly, resource)): a null assembly uses the calling
	assembly.

svn path=/trunk/gtk-sharp/; revision=20124
---
 ChangeLog         | 6 ++++++
 gdk/Pixbuf.custom | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e4e3f5641..624fab680 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* gdk/Pixbuf.custom:
+	(LoadResource (assembly, resource)): a null assembly uses the calling
+	assembly.
+
 2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
 
 	* gdk/Pixbuf.custom: Removed the Assembly constructors.
diff --git a/gdk/Pixbuf.custom b/gdk/Pixbuf.custom
index b1498b60a..d533050eb 100644
--- a/gdk/Pixbuf.custom
+++ b/gdk/Pixbuf.custom
@@ -30,6 +30,9 @@
 		
 		static public Pixbuf LoadResource (System.Reflection.Assembly assembly, string resource)
 		{
+			if (assembly == null)
+				return LoadResource (resource);
+
 			System.IO.Stream s = assembly.GetManifestResourceStream (resource);
 			if (s == null)
 				return null;