tomboy r1885 - in trunk: . Tomboy

[kkubasik svn gnome org]

Author: kkubasik
Date: Fri Feb 22 23:40:47 2008
New Revision: 1885
URL: http://svn.gnome.org/viewvc/tomboy?rev=1885&view=rev

Log:
* Tomboy/Tray.cs: Fix bug #503226: Infinite recursion with panels less
  that 16. Patch based on work from Dmitry K.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Tray.cs

Modified: trunk/Tomboy/Tray.cs
==============================================================================
--- trunk/Tomboy/Tray.cs	(original)
+++ trunk/Tomboy/Tray.cs	Fri Feb 22 23:40:47 2008
@@ -522,17 +522,18 @@
 			// it's a 1x1 pixel.  Prevent against this by returning a
 			// reasonable default.  Setting the icon causes OnSizeAllocated
 			// to be called again anyhow.
-			if (panel_size < 16)
-				panel_size = 16;
+			int icon_size = panel_size;
+			if (icon_size < 16)
+				icon_size = 16;
+
 
 			// Control specifically which icon is used at the smaller sizes
 			// so that no scaling occurs.  In the case of the panel applet,
 			// add a couple extra pixels of padding so it matches the behavior
 			// of the notification area tray icon.  See bug #403500 for more
 			// info.
-			int icon_size = panel_size;
 			if (Tomboy.IsPanelApplet)
-				icon_size = panel_size - 2; // padding
+				icon_size = icon_size - 2; // padding
 			if (icon_size <= 21)
 				icon_size = 16;
 			else if (icon_size <= 31)