[f-spot/rubenv-gsoc-2009: 70/86] Be more strict about disposing in loaders.



commit 48f056486164089a95fc8bf3afe171349e6939fa
Author: Ruben Vermeersch <ruben savanne be>
Date:   Wed Aug 12 13:58:37 2009 +0200

    Be more strict about disposing in loaders.

 lib/libfspotraw/fspot-librawloader.cpp |    2 +-
 src/Loaders/GdkImageLoader.cs          |    2 +-
 src/Loaders/LibrawImageLoader.cs       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/lib/libfspotraw/fspot-librawloader.cpp b/lib/libfspotraw/fspot-librawloader.cpp
index dd14a97..6cb0580 100644
--- a/lib/libfspotraw/fspot-librawloader.cpp
+++ b/lib/libfspotraw/fspot-librawloader.cpp
@@ -12,7 +12,7 @@
 
 #include <libraw/libraw.h>
 
-#define return_null_if(cond) if ((cond)) { g_print ("Stopping running!"); self->priv->running = false; return NULL; }
+#define return_null_if(cond) if ((cond)) { self->priv->running = false; return NULL; }
 
 G_DEFINE_TYPE (FSpotLibrawLoader, fspot_librawloader, G_TYPE_OBJECT);
 
diff --git a/src/Loaders/GdkImageLoader.cs b/src/Loaders/GdkImageLoader.cs
index bef16c5..323b7b2 100644
--- a/src/Loaders/GdkImageLoader.cs
+++ b/src/Loaders/GdkImageLoader.cs
@@ -61,7 +61,7 @@ namespace FSpot.Loaders {
 		public ImageLoaderItem Load (ImageLoaderItem items, bool async)
 		{
 			if (is_disposed)
-				return ImageLoaderItem.None;
+				throw new Exception ("Can't request after disposing!");
 
 			ItemsRequested |= items;
 
diff --git a/src/Loaders/LibrawImageLoader.cs b/src/Loaders/LibrawImageLoader.cs
index ef16d8f..e4c12a8 100644
--- a/src/Loaders/LibrawImageLoader.cs
+++ b/src/Loaders/LibrawImageLoader.cs
@@ -77,7 +77,7 @@ namespace FSpot.Loaders {
 		public ImageLoaderItem Load (ImageLoaderItem items, bool async)
 		{
 			if (is_disposed)
-				return ImageLoaderItem.None;
+				throw new Exception ("Can't request after disposing!");
 
 			Log.Debug ("Loading {0} from {1}", items, uri);
 



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