f-spot r3969 - in trunk/src: . Widgets

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed May 21 14:55:55 2008
New Revision: 3969
URL: http://svn.gnome.org/viewvc/f-spot?rev=3969&view=rev

Log:
removing the base call on OnSizeRequested overrides. that was broken on newer gtk-sharp

Modified:
   trunk/src/GroupSelector.cs
   trunk/src/Loupe.cs
   trunk/src/Widgets/Filmstrip.cs

Modified: trunk/src/GroupSelector.cs
==============================================================================
--- trunk/src/GroupSelector.cs	(original)
+++ trunk/src/GroupSelector.cs	Wed May 21 14:55:55 2008
@@ -967,7 +967,6 @@
 		{
 			requisition.Width = 500;
 			requisition.Height = (int) (LegendHeight () + glass.handle_height + 3 * border);
-			base.OnSizeRequested (ref requisition);
 		}
 
 		// FIXME I can't find a c# wrapper for the C PANGO_PIXELS () macro

Modified: trunk/src/Loupe.cs
==============================================================================
--- trunk/src/Loupe.cs	(original)
+++ trunk/src/Loupe.cs	Wed May 21 14:55:55 2008
@@ -609,7 +609,6 @@
 		{
 			Layout ();
 			requisition = Bounds;
-			base.OnSizeRequested (ref requisition);
 		}
 
 		protected virtual void BuildUI ()

Modified: trunk/src/Widgets/Filmstrip.cs
==============================================================================
--- trunk/src/Widgets/Filmstrip.cs	(original)
+++ trunk/src/Widgets/Filmstrip.cs	Wed May 21 14:55:55 2008
@@ -322,7 +322,6 @@
 				requisition.Width += BackgroundTile.Width - min_length % BackgroundTile.Width;	
 
 			requisition.Height = BackgroundTile.Height + (2 * y_offset);
-			base.OnSizeRequested(ref requisition);
 		}
 
 		Pixbuf background_pixbuf;
@@ -531,7 +530,15 @@
 
 		~Filmstrip ()
 		{
-			this.Dispose ();
+			Log.DebugFormat ("Finalizer called on {0}. Should be Disposed", GetType ());		
+			lock (this) {
+				if (background_pixbuf != null)
+					background_pixbuf.Dispose ();
+				if (background_tile != null)
+					background_tile.Dispose ();
+			}
+			background_pixbuf = null;
+			background_tile = null;
 		}
 			
 		public override void Dispose ()