[gthumb] Don't use local cache anymore in image loader; use gvfs local_path



commit cc5d80f5fd8237f916ca425e212c2da4794a455a
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Fri May 8 08:12:31 2009 -0400

    Don't use local cache anymore in image loader; use gvfs local_path
---
 libgthumb/image-loader.c |   34 +++++-----------------------------
 1 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/libgthumb/image-loader.c b/libgthumb/image-loader.c
index 82c66cd..c6e5d4f 100644
--- a/libgthumb/image-loader.c
+++ b/libgthumb/image-loader.c
@@ -716,32 +716,25 @@ check_thread (gpointer data)
 
 
 static void
-image_loader_start__step3 (const char     *uri,
-			   GError         *error,
-			   gpointer        data)
+image_loader_start__step2 (ImageLoader *il)
 {
-	ImageLoader *il = data;
-	
-	g_return_if_fail (il != NULL);
-
-	if (error) {
-		image_loader_error (il);
-		return;
-	}
-
 	g_mutex_lock (il->priv->data_mutex);
+
 	il->priv->done = FALSE;
 	il->priv->error = FALSE;
 	il->priv->loader_done = FALSE;
 	il->priv->loading = TRUE;
+
 	if (il->priv->pixbuf != NULL) {
 		g_object_unref (il->priv->pixbuf);
 		il->priv->pixbuf = NULL;
 	}
+
 	if (il->priv->animation != NULL) {
 		g_object_unref (il->priv->animation);
 		il->priv->animation = NULL;
 	}
+
 	g_mutex_unlock (il->priv->data_mutex);
 
 	g_mutex_lock (il->priv->start_loading_mutex);
@@ -753,23 +746,6 @@ image_loader_start__step3 (const char     *uri,
 }
 
 
-static void
-image_loader_start__step2 (ImageLoader *il)
-{
-	FileData *file;
-	
-	g_mutex_lock (il->priv->data_mutex);
-	file = file_data_dup (il->priv->file);
-	g_mutex_unlock (il->priv->data_mutex);
-	
-	if (is_local_file (file->path)) 
-		image_loader_start__step3 (file->path, NULL, il);
-	else
-		copy_remote_file_to_cache (file, image_loader_start__step3, il);
-	file_data_unref (file);
-}
-
-
 void
 image_loader_start (ImageLoader *il)
 {



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