[f-spot] Renamed PixbufLoader to ImageLoaderThread.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: svn-commits-list gnome org
- Subject: [f-spot] Renamed PixbufLoader to ImageLoaderThread.
- Date: Wed, 17 Jun 2009 12:25:29 -0400 (EDT)
commit 97a6744aef058ffc23784cd16e0a2eb5a455ae1d
Author: Ruben Vermeersch <ruben savanne be>
Date: Wed Jun 17 18:24:49 2009 +0200
Renamed PixbufLoader to ImageLoaderThread.
Prevents a namespace clash with Gdk.
src/Core.cs | 2 +-
src/{PixbufLoader.cs => ImageLoaderThread.cs} | 8 ++++----
src/Makefile.am | 2 +-
src/PixbufCache.cs | 2 +-
src/ThumbnailGenerator.cs | 2 +-
src/Widgets/Filmstrip.cs | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/Core.cs b/src/Core.cs
index 2bb905b..232cbaf 100644
--- a/src/Core.cs
+++ b/src/Core.cs
@@ -273,7 +273,7 @@ namespace FSpot {
if (toplevels.Count == 0) {
Banshee.Kernel.Scheduler.Dispose ();
Core.Database.Dispose ();
- PixbufLoader.Cleanup ();
+ ImageLoaderThread.Cleanup ();
Gtk.Application.Quit ();
System.Environment.Exit (0);
}
diff --git a/src/PixbufLoader.cs b/src/ImageLoaderThread.cs
similarity index 97%
rename from src/PixbufLoader.cs
rename to src/ImageLoaderThread.cs
index 0f9be9a..9e3ccda 100644
--- a/src/PixbufLoader.cs
+++ b/src/ImageLoaderThread.cs
@@ -1,5 +1,5 @@
/*
- * PixbufLoader.cs
+ * ImageLoaderThread.cs
*
* Author(s):
* Ettore Perazzoli <ettore perazzoli org>
@@ -16,7 +16,7 @@ using System;
using FSpot.Utils;
-public class PixbufLoader {
+public class ImageLoaderThread {
// Types.
@@ -79,10 +79,10 @@ public class PixbufLoader {
// Public API.
- public delegate void PixbufLoadedHandler (PixbufLoader loader, Uri uri, int order, Pixbuf result);
+ public delegate void PixbufLoadedHandler (ImageLoaderThread loader, Uri uri, int order, Pixbuf result);
public event PixbufLoadedHandler OnPixbufLoaded;
- public PixbufLoader ()
+ public ImageLoaderThread ()
{
queue = new ArrayList ();
requests_by_uri = new Dictionary<Uri, RequestItem> ();
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b41601..138de9d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,6 +170,7 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/GroupSelector.cs \
$(srcdir)/Accelerometer.cs \
$(srcdir)/Histogram.cs \
+ $(srcdir)/ImageLoaderThread.cs \
$(srcdir)/ImportBackend.cs \
$(srcdir)/ImportCommand.cs \
$(srcdir)/InfoOverlay.cs \
@@ -213,7 +214,6 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/PhotoVersionCommands.cs \
$(srcdir)/PhotoVersionMenu.cs \
$(srcdir)/PhotoView.cs \
- $(srcdir)/PixbufLoader.cs \
$(srcdir)/PixbufUtils.cs \
$(srcdir)/PixbufCache.cs \
$(srcdir)/PixelBuffer.cs \
diff --git a/src/PixbufCache.cs b/src/PixbufCache.cs
index a4d5732..81f653b 100644
--- a/src/PixbufCache.cs
+++ b/src/PixbufCache.cs
@@ -36,7 +36,7 @@ namespace FSpot {
ThumbnailGenerator.Default.OnPixbufLoaded += HandleThumbnailLoaded;
}
- public void HandleThumbnailLoaded (PixbufLoader loader, Uri uri, int order, Gdk.Pixbuf result)
+ public void HandleThumbnailLoaded (ImageLoaderThread loader, Uri uri, int order, Gdk.Pixbuf result)
{
if (result != null)
Reload (uri);
diff --git a/src/ThumbnailGenerator.cs b/src/ThumbnailGenerator.cs
index 12d15a5..19bcd96 100644
--- a/src/ThumbnailGenerator.cs
+++ b/src/ThumbnailGenerator.cs
@@ -13,7 +13,7 @@ using FSpot.Utils;
using FSpot.Platform;
namespace FSpot {
- public class ThumbnailGenerator : PixbufLoader {
+ public class ThumbnailGenerator : ImageLoaderThread {
static public ThumbnailGenerator Default = new ThumbnailGenerator ();
diff --git a/src/Widgets/Filmstrip.cs b/src/Widgets/Filmstrip.cs
index 542f91f..cc46316 100644
--- a/src/Widgets/Filmstrip.cs
+++ b/src/Widgets/Filmstrip.cs
@@ -486,7 +486,7 @@ namespace FSpot.Widgets
QueueDraw ();
}
- void HandlePixbufLoaded (PixbufLoader pl, Uri uri, int order, Pixbuf p) {
+ void HandlePixbufLoaded (ImageLoaderThread pl, Uri uri, int order, Pixbuf p) {
if (!thumb_cache.Contains (uri)) {
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]