[Monodevelop-patches-list] r816 - trunk/MonoDevelop/src/Main/Base/Services

[commit-watcher at mono-cvs.ximian.com]

Author: ggiraldez
Date: 2004-02-07 19:48:44 -0500 (Sat, 07 Feb 2004)
New Revision: 816

Modified:
   trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs
   trunk/MonoDevelop/src/Main/Base/Services/StockIcons.cs
Log:
Since the Gtk# bug has been fixed, it's no longer necessary to check for Handle != IntPtr.Zero.



Modified: trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs	2004-02-08 00:48:01 UTC (rev 815)
+++ trunk/MonoDevelop/src/Main/Base/Services/ResourceService.cs	2004-02-08 00:48:44 UTC (rev 816)
@@ -311,11 +311,7 @@
 			if (stockid != null)
 			{
 				Gtk.IconSet iconset = Gtk.IconFactory.LookupDefault (stockid);
-				if (iconset != null && iconset.Handle != IntPtr.Zero) {
-					// Gtk.IconFactory.Lookup never returns null, but
-					// the actual underlying GObject might be NULL
-					// (bug in Gtk#?)
-
+				if (iconset != null) {
 					// use P/Invoke to be able to pass some NULL parameters
 					IntPtr raw_ret = gtk_icon_set_render_icon
 						(iconset.Handle,

Modified: trunk/MonoDevelop/src/Main/Base/Services/StockIcons.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/StockIcons.cs	2004-02-08 00:48:01 UTC (rev 815)
+++ trunk/MonoDevelop/src/Main/Base/Services/StockIcons.cs	2004-02-08 00:48:44 UTC (rev 816)
@@ -41,10 +41,7 @@
 				                                    + filename);
 
 				Gtk.IconSet iconSet = iconFactory.Lookup (stockId);
-				if (iconSet == null || iconSet.Handle == IntPtr.Zero) {
-					// Gtk.IconFactory.Lookup never returns null, but
-					// the actual underlying GObject might be NULL
-					// (bug in Gtk#?)
+				if (iconSet == null) {
 					iconSet = new Gtk.IconSet ();
 					iconFactory.Add (stockId, iconSet);
 				}