[f-spot] Move stuff around so that, in time, it can be moved to a separate assembly.



commit 45ff3ce6cd1e26faef4f3f074067217fb118e701
Author: Ruben Vermeersch <ruben savanne be>
Date:   Wed Jul 8 14:29:39 2009 +0100

    Move stuff around so that, in time, it can be moved to a separate assembly.

 src/{ImageLoader.cs => Loaders/GdkImageLoader.cs} |    6 +++---
 src/{ => Loaders}/IImageLoader.cs                 |    4 ++--
 src/Makefile.am                                   |    4 ++--
 src/PhotoImageView.cs                             |    3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/src/ImageLoader.cs b/src/Loaders/GdkImageLoader.cs
similarity index 97%
rename from src/ImageLoader.cs
rename to src/Loaders/GdkImageLoader.cs
index dd6da9a..511aa19 100644
--- a/src/ImageLoader.cs
+++ b/src/Loaders/GdkImageLoader.cs
@@ -15,11 +15,11 @@ using Gdk;
 using FSpot.Utils;
 using FSpot.Platform;
 
-namespace FSpot {
-	public class ImageLoader : Gdk.PixbufLoader, IImageLoader
+namespace FSpot.Loaders {
+	public class GdkImageLoader : Gdk.PixbufLoader, IImageLoader
 	{
 #region public api
-		public ImageLoader () : base ()
+		public GdkImageLoader () : base ()
 		{	
 		}
 
diff --git a/src/IImageLoader.cs b/src/Loaders/IImageLoader.cs
similarity index 94%
rename from src/IImageLoader.cs
rename to src/Loaders/IImageLoader.cs
index a6bd960..4381949 100644
--- a/src/IImageLoader.cs
+++ b/src/Loaders/IImageLoader.cs
@@ -1,5 +1,5 @@
 //
-// Fspot.IImageLoader.cs
+// Fspot.Loaders.IImageLoader.cs
 //
 // Copyright (c) 2009 Novell, Inc.
 //
@@ -14,7 +14,7 @@ using FSpot.Utils;
 using System;
 using Gdk;
 
-namespace FSpot {
+namespace FSpot.Loaders {
 	public class AreaPreparedEventArgs : EventArgs
 	{
 		bool reduced_resolution;
diff --git a/src/Makefile.am b/src/Makefile.am
index d75ed2f..30f4b5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,9 +174,9 @@ F_SPOT_CSDISTFILES =				\
 	$(srcdir)/GroupSelector.cs		\
 	$(srcdir)/Accelerometer.cs		\
 	$(srcdir)/Histogram.cs			\
-	$(srcdir)/IImageLoader.cs		\
+	$(srcdir)/Loaders/IImageLoader.cs		\
+	$(srcdir)/Loaders/GdkImageLoader.cs		\
 	$(srcdir)/ImageLoaderThread.cs		\
-	$(srcdir)/ImageLoader.cs		\
 	$(srcdir)/ImportBackend.cs		\
 	$(srcdir)/ImportCommand.cs		\
 	$(srcdir)/InfoOverlay.cs		\
diff --git a/src/PhotoImageView.cs b/src/PhotoImageView.cs
index 683de2d..688e9ae 100644
--- a/src/PhotoImageView.cs
+++ b/src/PhotoImageView.cs
@@ -13,6 +13,7 @@
 using System;
 using FSpot.Editors;
 using FSpot.Utils;
+using FSpot.Loaders;
 
 using Gdk;
 
@@ -202,7 +203,7 @@ namespace FSpot.Widgets {
 			if (loader != null)
 				loader.Dispose ();
 
-			loader = new ImageLoader ();
+			loader = new GdkImageLoader ();
 			loader.AreaPrepared += HandlePixbufPrepared;
 			loader.AreaUpdated += HandlePixbufAreaUpdated;
 			loader.Completed += HandleDone;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]