[gthumb] local_file_move and file_rename were exactly the same as file_move

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

commit 19950cbb06c042d6c8cbaab3d35bafa5daf8e0ea
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Tue May 12 08:42:30 2009 -0400

    local_file_move and file_rename were exactly the same as file_move
---
 libgthumb/file-utils.c              |   16 ----------------
 libgthumb/file-utils.h              |    4 ----
 src/dlg-file-utils.c                |    2 +-
 src/gth-browser-actions-callbacks.c |   10 +++++-----
 src/rotation-utils.c                |    2 +-
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/libgthumb/file-utils.c b/libgthumb/file-utils.c
index fecde7a..ae24c8c 100644
--- a/libgthumb/file-utils.c
+++ b/libgthumb/file-utils.c
@@ -672,22 +672,6 @@ file_move (const char *from,
 
 
 gboolean
-local_file_move (const char *from,
-	         const char *to)
-{
-	return xfer_file (from, to, TRUE);
-}
-
-
-gboolean
-file_rename (const char *from,
-	     const char *to)
-{
-	return xfer_file (from, to, TRUE);
-}
-
-
-gboolean
 file_unlink (const char *path)
 {
 	GFile    *file;
diff --git a/libgthumb/file-utils.h b/libgthumb/file-utils.h
index c516b63..694e6bc 100644
--- a/libgthumb/file-utils.h
+++ b/libgthumb/file-utils.h
@@ -126,10 +126,6 @@ gboolean            file_copy                     (const char       *from,
 						   const char       *to);
 gboolean            file_move                     (const char       *from,
 						   const char       *to);
-gboolean            local_file_move               (const char       *from,
-						   const char       *to);
-gboolean            file_rename                   (const char       *old_path,
-						   const char       *new_path);
 gboolean            file_unlink                   (const char       *path);
 void		    delete_thumbnail	          (const char       *path);
 gboolean            mime_type_is                  (const char       *mime_type,
diff --git a/src/dlg-file-utils.c b/src/dlg-file-utils.c
index 2c5f21d..9908ec7 100644
--- a/src/dlg-file-utils.c
+++ b/src/dlg-file-utils.c
@@ -1036,7 +1036,7 @@ dlg_file_rename_series (GthWindow *window,
 			continue;
 		}
 
-		result = file_rename (old_full_path, new_full_path);
+		result = file_move (old_full_path, new_full_path);
 		if (result) {
 			cache_move (old_full_path, new_full_path);
 			comment_move (old_full_path, new_full_path);
diff --git a/src/gth-browser-actions-callbacks.c b/src/gth-browser-actions-callbacks.c
index d63b54a..dfa4d06 100644
--- a/src/gth-browser-actions-callbacks.c
+++ b/src/gth-browser-actions-callbacks.c
@@ -509,7 +509,7 @@ catalog_rename (GthBrowser *browser,
 				       _("The name \"%s\" is already used. " "Please use a different name."), utf8_name);
 		g_free (utf8_name);
 	} 
-	else if (file_rename (catalog_path, new_catalog_path)) {
+	else if (file_move (catalog_path, new_catalog_path)) {
 		all_windows_notify_catalog_rename (catalog_path,
 						   new_catalog_path);
 	} 
@@ -1037,14 +1037,14 @@ folder_rename (GtkWindow  *window,
 
 		old_folder_comment = comments_get_comment_filename (old_path, TRUE);
 
-		result = file_rename (old_path, new_path);
+		result = file_move (old_path, new_path);
 		if (result) {
 			char *new_folder_comment;
 
 			/* Comment cache. */
 
 			new_folder_comment = comments_get_comment_filename (new_path, TRUE);
-			file_rename (old_folder_comment, new_folder_comment);
+			file_move (old_folder_comment, new_folder_comment);
 			g_free (new_folder_comment);
 
 			all_windows_notify_directory_rename (old_path, new_path);
@@ -1347,7 +1347,7 @@ folder_copy__response_cb (GObject *object,
 
 		old_folder_comment = comments_get_comment_filename (old_path, TRUE);
 
-		result = file_rename (old_path, new_path);
+		result = file_move (old_path, new_path);
 		if (result) {
 			char *new_folder_comment;
 
@@ -1355,7 +1355,7 @@ folder_copy__response_cb (GObject *object,
 			 * implemeted with rename, which is faster. */
 
 			new_folder_comment = comments_get_comment_filename (new_path, TRUE);
-			file_rename (old_folder_comment, new_folder_comment);
+			file_move (old_folder_comment, new_folder_comment);
 			g_free (new_folder_comment);
 
 			all_windows_notify_directory_rename (old_path, new_path);
diff --git a/src/rotation-utils.c b/src/rotation-utils.c
index 1964dac..442f5cd 100644
--- a/src/rotation-utils.c
+++ b/src/rotation-utils.c
@@ -203,7 +203,7 @@ apply_transformation_jpeg (FileData       *file,
 		goto apply_transformation_jpeg__free_and_close;
 	}
 
-	if (! local_file_move (tmp_output_file, file->local_path)) {
+	if (! file_move (tmp_output_file, file->local_path)) {
 		if (error != NULL)
 			*error = g_error_new (GTHUMB_ERROR, 0, "%s", _("Could not move temporary file to local destination. Check folder permissions."));
 		result = FALSE;