[gthumb: 15/40] removed other unused functions

[Paolo Bacchilega <paobac src gnome org>]

commit 92c619f00ff53a1f2144a39a5e20384e8b820a1a
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Sep 5 17:15:05 2010 +0200

    removed other unused functions

 gthumb/gth-image-loader.c |   32 --------------------------------
 gthumb/gth-image-loader.h |    6 ------
 gthumb/gth-thumb-loader.c |    9 +++++++--
 3 files changed, 7 insertions(+), 40 deletions(-)
---
diff --git a/gthumb/gth-image-loader.c b/gthumb/gth-image-loader.c
index b5ea532..5ae3106 100644
--- a/gthumb/gth-image-loader.c
+++ b/gthumb/gth-image-loader.c
@@ -419,25 +419,6 @@ gth_image_loader_set_file_data (GthImageLoader *self,
 }
 
 
-void
-gth_image_loader_set_file (GthImageLoader *self,
-			   GFile          *file,
-			   const char     *mime_type)
-{
-	GthFileData *file_data;
-
-	file_data = gth_file_data_new (file, NULL);
-	if (mime_type != NULL)
-		gth_file_data_set_mime_type (file_data, mime_type);
-	else
-		gth_file_data_update_mime_type (file_data, TRUE); /* FIXME: always fast mime type is not good */
-
-	gth_image_loader_set_file_data (self, file_data);
-
-	g_object_unref (file_data);
-}
-
-
 GthFileData *
 gth_image_loader_get_file (GthImageLoader *self)
 {
@@ -760,19 +741,6 @@ gth_image_loader_cancel (GthImageLoader *self,
 }
 
 
-void
-gth_image_loader_cancel_with_error (GthImageLoader *self,
-				    DataFunc        done_func,
-				    gpointer        done_func_data)
-{
-	g_mutex_lock (self->priv->data_mutex);
-	self->priv->error = g_error_new_literal (GTH_ERROR, 0, "cancelled");
-	g_mutex_unlock (self->priv->data_mutex);
-
-	_gth_image_loader_stop (self, done_func, done_func_data, TRUE, TRUE);
-}
-
-
 GdkPixbuf *
 gth_image_loader_get_pixbuf (GthImageLoader *self)
 {
diff --git a/gthumb/gth-image-loader.h b/gthumb/gth-image-loader.h
index 80d8e62..36fff43 100644
--- a/gthumb/gth-image-loader.h
+++ b/gthumb/gth-image-loader.h
@@ -64,9 +64,6 @@ void                 gth_image_loader_set_loader              (GthImageLoader
 						               gpointer           data);
 void                 gth_image_loader_set_file_data           (GthImageLoader    *iloader,
 						               GthFileData       *file);
-void                 gth_image_loader_set_file                (GthImageLoader    *iloader,
-							       GFile             *file,
-							       const char        *mime_type);               
 GthFileData *        gth_image_loader_get_file                (GthImageLoader    *iloader);
 void                 gth_image_loader_set_pixbuf              (GthImageLoader    *iloader,
 						               GdkPixbuf         *pixbuf);
@@ -81,9 +78,6 @@ void                 gth_image_loader_load_at_size            (GthImageLoader
 void                 gth_image_loader_cancel                  (GthImageLoader    *iloader,
 						               DataFunc           done_func,
 						               gpointer           done_func_data);
-void                 gth_image_loader_cancel_with_error       (GthImageLoader    *iloader,
-						               DataFunc           done_func,
-						               gpointer           done_func_data);
 
 G_END_DECLS
 
diff --git a/gthumb/gth-thumb-loader.c b/gthumb/gth-thumb-loader.c
index 6925587..b78fec4 100644
--- a/gthumb/gth-thumb-loader.c
+++ b/gthumb/gth-thumb-loader.c
@@ -723,12 +723,17 @@ gth_thumb_loader_load__step2 (GthThumbLoader *self)
 	}
 
 	if (cache_path != NULL) {
-		GFile *file;
+		GFile       *file;
+		GthFileData *file_data;
 
 		self->priv->loading_from_cache = TRUE;
+
 		file = g_file_new_for_path (cache_path);
-		gth_image_loader_set_file (self->priv->iloader, file, "image/png");
+		file_data = gth_file_data_new (file, NULL);
+		gth_file_data_set_mime_type (file_data, "image/png");
+		gth_image_loader_set_file_data (self->priv->iloader, file_data);
 
+		g_object_unref (file_data);
 		g_object_unref (file);
 		g_free (cache_path);
 	}