gthumb r2484 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Sat Dec 27 17:35:15 2008
New Revision: 2484
URL: http://svn.gnome.org/viewvc/gthumb?rev=2484&view=rev

Log:
2008-12-27  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/image-loader.c: (image_loader_init):
        * libgthumb/image-loader.h:
        * src/gthumb-preloader.c: (gthumb_preloader_load__step2):
        Removed the unusued "priority" variable in the image loader, which
        also permitted the removal of the gnomevfs code in the image loader.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/image-loader.c
   trunk/libgthumb/image-loader.h
   trunk/src/gthumb-preloader.c

Modified: trunk/libgthumb/image-loader.c
==============================================================================
--- trunk/libgthumb/image-loader.c	(original)
+++ trunk/libgthumb/image-loader.c	Sat Dec 27 17:35:15 2008
@@ -28,9 +28,6 @@
 #include <fcntl.h>
 #include <gtk/gtk.h>
 #include <libgnomeui/gnome-thumbnail.h>
-#include <libgnomevfs/gnome-vfs-async-ops.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <sys/stat.h>
 #include "image-loader.h"
@@ -66,8 +63,6 @@
 	gboolean               interrupted;
 	gboolean               loading;
 
-	int                    priority;
-
 	DoneFunc               done_func;
 	gpointer               done_func_data;
 
@@ -257,8 +252,6 @@
 	priv->loader_done = FALSE;
 	priv->interrupted = FALSE;
 
-	priv->priority = GNOME_VFS_PRIORITY_DEFAULT;
-
 	priv->done_func = NULL;
 	priv->done_func_data = NULL;
 
@@ -881,18 +874,6 @@
 }
 
 
-void
-image_loader_set_priority (ImageLoader *il,
-			   int          priority)
-{
-	ImageLoaderPrivateData *priv;
-
-	g_return_if_fail (il != NULL);
-	priv = il->priv;
-	priv->priority = priority;
-}
-
-
 GdkPixbufAnimation *
 image_loader_get_animation (ImageLoader *il)
 {

Modified: trunk/libgthumb/image-loader.h
==============================================================================
--- trunk/libgthumb/image-loader.h	(original)
+++ trunk/libgthumb/image-loader.h	Sat Dec 27 17:35:15 2008
@@ -75,8 +75,6 @@
 void                 image_loader_set_pixbuf              (ImageLoader       *il,
 						           GdkPixbuf         *pixbuf);
 GdkPixbuf *          image_loader_get_pixbuf              (ImageLoader       *il);
-void                 image_loader_set_priority            (ImageLoader       *il,
-						           int                priority);
 GdkPixbufAnimation * image_loader_get_animation           (ImageLoader       *il);
 gint                 image_loader_get_is_done             (ImageLoader       *il);
 void                 image_loader_start                   (ImageLoader       *il);

Modified: trunk/src/gthumb-preloader.c
==============================================================================
--- trunk/src/gthumb-preloader.c	(original)
+++ trunk/src/gthumb-preloader.c	Sat Dec 27 17:35:15 2008
@@ -431,22 +431,6 @@
 		debug (DEBUG_INFO, "[+] [%d] <- %s", k, file->path);
 	}
 
-	for (i = 0; i < N_LOADERS; i++)
-		if (loader_assigned[i]) {
-			PreLoader *ploader = gploader->loader[i];
-			int        priority;
-
-			if (ploader->file == NULL)
-				continue;
-
-			if (same_uri (ploader->file->path, requested->path))
-				priority = GNOME_VFS_PRIORITY_MAX;
-			else
-				priority = GNOME_VFS_PRIORITY_MIN;
-
-			image_loader_set_priority (ploader->loader, priority);
-		}
-
 	load_data_free (load_data);
 
 	gploader->stopped = FALSE;