eog r4810 - in trunk: . src

[friemann svn gnome org]

Author: friemann
Date: Tue Sep 30 11:58:28 2008
New Revision: 4810
URL: http://svn.gnome.org/viewvc/eog?rev=4810&view=rev

Log:
2008-09-30  Felix Riemann  <friemann svn gnome org>

	* src/eog-image.c: (eog_image_copy_file),
	(eog_image_save_as_by_info):
	Fix progress reporting when images only need copying during SaveAs.


Modified:
   trunk/ChangeLog
   trunk/src/eog-image.c

Modified: trunk/src/eog-image.c
==============================================================================
--- trunk/src/eog-image.c	(original)
+++ trunk/src/eog-image.c	Tue Sep 30 11:58:28 2008
@@ -1515,7 +1515,7 @@
 }
 
 static gboolean
-eog_image_copy_file (EogImageSaveInfo *source, EogImageSaveInfo *target, GError **error)
+eog_image_copy_file (EogImage *image, EogImageSaveInfo *source, EogImageSaveInfo *target, GError **error)
 {
 	gboolean result;
 	GError *ioerror;
@@ -1528,8 +1528,8 @@
 			      (target->overwrite ? G_FILE_COPY_OVERWRITE : 0) |
 			      G_FILE_COPY_ALL_METADATA,
 			      NULL, 
-			      NULL,  /* no progress callback */
-			      NULL,
+			      EOG_IS_IMAGE (image) ? transfer_progress_cb :NULL,
+			      image,
 			      &ioerror);
 	
 	if (result == FALSE) {
@@ -1588,7 +1588,7 @@
 	
 	/* determine kind of saving */
 	if (g_ascii_strcasecmp (source->format, target->format) == 0 && !source->modified) {
-		success = eog_image_copy_file (source, target, error);
+		success = eog_image_copy_file (img, source, target, error);
 		direct_copy = success;
 	}