[gthumb] Use fd->name or utf8_name instead of file_name_from_path function

[Michael J. Chudobiak <mjc src gnome org>]

commit d82445b2cc967fe8e802458fd3dda16aba70e114
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Wed May 6 15:57:11 2009 -0400

    Use fd->name or utf8_name instead of file_name_from_path function
---
 src/dlg-convert.c        |    2 +-
 src/dlg-photo-importer.c |    2 +-
 src/gth-batch-op.c       |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dlg-convert.c b/src/dlg-convert.c
index 9a24702..184c6a9 100644
--- a/src/dlg-convert.c
+++ b/src/dlg-convert.c
@@ -163,7 +163,7 @@ load_current_image (DialogData *data)
 	data->new_path = NULL;
 
 	fd = (FileData*) data->current_image->data;
-	name_no_ext = remove_extension_from_path (file_name_from_path (fd->path));
+	name_no_ext = remove_extension_from_path (fd->name);
 
 	data->new_path = g_strconcat (data->destination, "/", name_no_ext, ".", data->ext, NULL);
 
diff --git a/src/dlg-photo-importer.c b/src/dlg-photo-importer.c
index 6b5d9cc..4d54841 100644
--- a/src/dlg-photo-importer.c
+++ b/src/dlg-photo-importer.c
@@ -1575,7 +1575,7 @@ adjust_orientation__step (AsyncOperationData *aodata,
 
 		if (data->msg_text != NULL)
 	                g_free (data->msg_text);
-		data->msg_text = g_strdup_printf (_("Adjusting orientation of \'%s\'."), file_name_from_path (fd->path));
+		data->msg_text = g_strdup_printf (_("Adjusting orientation of \'%s\'."), fd->utf8_name);
 
 		transform = get_orientation_from_fd (fd);
 		if (image_is_jpeg (uri))
diff --git a/src/gth-batch-op.c b/src/gth-batch-op.c
index 7170f21..9cbc822 100644
--- a/src/gth-batch-op.c
+++ b/src/gth-batch-op.c
@@ -384,10 +384,10 @@ load_current_image (GthBatchOp *bop)
 		folder = remove_level_from_path (PD(bop)->new_path);
 	else
 		folder = g_strdup (PD(bop)->destination);
-	name_no_ext = remove_extension_from_path (file_name_from_path (fd->path));
+	name_no_ext = remove_extension_from_path (fd->name);
 
 	if (mime_type_is (fd->mime_type, get_mime_type_from_ext (PD(bop)->image_type)))
-		PD(bop)->new_path = g_strconcat (folder, "/", file_name_from_path (fd->path), NULL);
+		PD(bop)->new_path = g_strconcat (folder, "/", fd->name, NULL);
 	else
 		PD(bop)->new_path = g_strconcat (folder, "/", name_no_ext, ".", PD(bop)->image_type, NULL);