[f-spot/FSPOT_0_6_0_STABLE] read the scrensaver delay from prefs

[Stephane Delcroix <sdelcroix src gnome org>]

commit 3caa9cb5b78d15b2bab17d8b6856cf5d30eb9941
Author: Stephane Delcroix <stephane delcroix org>
Date:   Fri Aug 21 15:52:16 2009 +0200

    read the scrensaver delay from prefs

 src/Core.cs      |    5 ++++-
 src/SlideView.cs |    8 +++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/Core.cs b/src/Core.cs
index 232cbaf..28c4555 100644
--- a/src/Core.cs
+++ b/src/Core.cs
@@ -171,6 +171,9 @@ namespace FSpot {
 				else
 					photos = new Photo [0];
 
+				double delay = Preferences.Get<double> (Preferences.APP_FSPOT + "screensaver/delay");
+				delay = Math.Max (1.0, delay);
+
 				window = new XScreenSaverSlide ();
 				SetStyle (window);
 				if (photos.Length > 0) {
@@ -178,7 +181,7 @@ namespace FSpot {
 					
 					Gdk.Pixbuf black = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, false, 8, 1, 1);
 					black.Fill (0x00000000);
-					slideview = new SlideView (black, photos);
+					slideview = new SlideView (black, photos, delay);
 					window.Add (slideview);
 				} else {
 					Gtk.HBox outer = new Gtk.HBox ();
diff --git a/src/SlideView.cs b/src/SlideView.cs
index 5462cdf..a531840 100644
--- a/src/SlideView.cs
+++ b/src/SlideView.cs
@@ -76,7 +76,7 @@ namespace FSpot {
 			this.ButtonPressEvent += HandleSlideViewButtonPressEvent;
 			this.KeyPressEvent += HandleSlideViewKeyPressEvent;
 			this.AddEvents ((int) (EventMask.ButtonPressMask | EventMask.KeyPressMask | EventMask.PointerMotionMask));
-			slideview = new SlideView (screenshot, items);
+			slideview = new SlideView (screenshot, items, 2.0);
 			this.Add (slideview);
 			this.Decorated = false;
 			this.Fullscreen();
@@ -225,8 +225,6 @@ namespace FSpot {
 			current_idx = next_idx;
 			
 			black = false;
-			transition_interval = 75;
-			flip_interval = 2000;
 		}
 		
 		private bool PreloadNextImage (int idx)
@@ -540,7 +538,7 @@ namespace FSpot {
 			Stop ();
 		}
 
-		public SlideView (Pixbuf background, IBrowsableItem [] photos) : base ()
+		public SlideView (Pixbuf background, IBrowsableItem [] photos, double delay) : base ()
 		{
 			this.photos = photos;
 
@@ -550,7 +548,7 @@ namespace FSpot {
 				
 				current_idx = -1;
 				black = true;
-				flip_interval = 1500;
+				flip_interval = (uint)(delay * 1000);
 			}
 			
 			SizeAllocated += new SizeAllocatedHandler (HandleSizeAllocate);