diff src/thumb.c @ 845:06929cbcd796

renamed fd->pixbuf to fd->thumb_pixbuf
author nadvornik
date Sat, 21 Jun 2008 11:05:55 +0000
parents efed9a1520d6
children 0c3f6ef17d18
line wrap: on
line diff
--- a/src/thumb.c	Wed Jun 18 22:26:52 2008 +0000
+++ b/src/thumb.c	Sat Jun 21 11:05:55 2008 +0000
@@ -44,7 +44,7 @@
 	gint success = FALSE;
 	mode_t mode = 0755;
 
-	if (!tl || !tl->fd || !tl->fd->pixbuf) return FALSE;
+	if (!tl || !tl->fd || !tl->fd->thumb_pixbuf) return FALSE;
 
 	cache_dir = cache_get_location(CACHE_TYPE_THUMB, tl->fd->path, FALSE, &mode);
 
@@ -60,7 +60,7 @@
 		DEBUG_1("Saving thumb: %s", cache_path);
 
 		pathl = path_from_utf8(cache_path);
-		success = pixbuf_to_file_as_png(tl->fd->pixbuf, pathl);
+		success = pixbuf_to_file_as_png(tl->fd->thumb_pixbuf, pathl);
 		if (success)
 			{
 			struct utimbuf ut;
@@ -225,8 +225,8 @@
 		
 		if (tl->fd)
 			{
-			if (tl->fd->pixbuf) g_object_unref(tl->fd->pixbuf);
-			tl->fd->pixbuf = gdk_pixbuf_scale_simple(pixbuf, w, h, (GdkInterpType)options->thumbnails.quality);
+			if (tl->fd->thumb_pixbuf) g_object_unref(tl->fd->thumb_pixbuf);
+			tl->fd->thumb_pixbuf = gdk_pixbuf_scale_simple(pixbuf, w, h, (GdkInterpType)options->thumbnails.quality);
 			}
 		save = TRUE;
 		}
@@ -234,9 +234,9 @@
 		{
 		if (tl->fd)
 			{
-			if (tl->fd->pixbuf) g_object_unref(tl->fd->pixbuf);
-			tl->fd->pixbuf = pixbuf;
-			gdk_pixbuf_ref(tl->fd->pixbuf);
+			if (tl->fd->thumb_pixbuf) g_object_unref(tl->fd->thumb_pixbuf);
+			tl->fd->thumb_pixbuf = pixbuf;
+			gdk_pixbuf_ref(tl->fd->thumb_pixbuf);
 			}
 		save = il->shrunk;
 		}
@@ -391,9 +391,9 @@
 
 	if (!cache_path && options->thumbnails.use_xvpics)
 		{
-		if (tl->fd->pixbuf) g_object_unref(tl->fd->pixbuf);
-		tl->fd->pixbuf = get_xv_thumbnail(tl->fd->path, tl->max_w, tl->max_h);
-		if (tl->fd->pixbuf)
+		if (tl->fd->thumb_pixbuf) g_object_unref(tl->fd->thumb_pixbuf);
+		tl->fd->thumb_pixbuf = get_xv_thumbnail(tl->fd->path, tl->max_w, tl->max_h);
+		if (tl->fd->thumb_pixbuf)
 			{
 			thumb_loader_delay_done(tl);
 			return TRUE;
@@ -456,9 +456,9 @@
 		return thumb_loader_std_get_pixbuf((ThumbLoaderStd *)tl, with_fallback);
 		}
 
-	if (tl && tl->fd && tl->fd->pixbuf)
+	if (tl && tl->fd && tl->fd->thumb_pixbuf)
 		{
-		pixbuf = tl->fd->pixbuf;
+		pixbuf = tl->fd->thumb_pixbuf;
 		g_object_ref(pixbuf);
 		}
 	else if (with_fallback)