f-spot r4572 - in branches/FSPOT_0_5_0_STABLE: . src src/Core

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed Nov  5 07:59:27 2008
New Revision: 4572
URL: http://svn.gnome.org/viewvc/f-spot?rev=4572&view=rev

Log:
2008-11-05  Stephane Delcroix  <sdelcroix novell com>

	* src/TagSelectionWidget.cs:
	* src/Core/Tag.cs: fix for bgo 557793

Modified:
   branches/FSPOT_0_5_0_STABLE/ChangeLog
   branches/FSPOT_0_5_0_STABLE/src/Core/Tag.cs
   branches/FSPOT_0_5_0_STABLE/src/TagSelectionWidget.cs

Modified: branches/FSPOT_0_5_0_STABLE/src/Core/Tag.cs
==============================================================================
--- branches/FSPOT_0_5_0_STABLE/src/Core/Tag.cs	(original)
+++ branches/FSPOT_0_5_0_STABLE/src/Core/Tag.cs	Wed Nov  5 07:59:27 2008
@@ -108,6 +108,9 @@
 					if (Math.Max (cached_icon.Width, cached_icon.Height) <= (int) tag_icon_size) 
 						return cached_icon;
 				}
+				if (icon == null)
+					return null;
+
 				if (Math.Max (icon.Width, icon.Height) >= (int) tag_icon_size) { //Don't upscale
 					if (cached_icon != null)
 						cached_icon.Dispose ();

Modified: branches/FSPOT_0_5_0_STABLE/src/TagSelectionWidget.cs
==============================================================================
--- branches/FSPOT_0_5_0_STABLE/src/TagSelectionWidget.cs	(original)
+++ branches/FSPOT_0_5_0_STABLE/src/TagSelectionWidget.cs	Wed Nov  5 07:59:27 2008
@@ -192,7 +192,7 @@
 		SetBackground (renderer, tag);
 
 		// FIXME I can't set the Pixbuf to null, not sure if it's a GTK# bug...
-		if (tag.Icon != null) {
+		if (tag.SizedIcon != null) {
 			if (FSpot.ColorManagement.IsEnabled) {
 				//FIXME
 				Gdk.Pixbuf temp = tag.SizedIcon.Copy();