From 33aab046f5afa09fb63646ea17e436731f47558e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 22 Jan 2009 20:46:21 +0000
Subject: [PATCH] (trunk gtk) use g_remove() instead of g_unlink() so that
 folders can be deleted too

---
 gtk/add-dialog.c |  2 +-
 gtk/tr-torrent.c |  4 ++--
 gtk/util.c       | 14 ++++++--------
 gtk/util.h       |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/gtk/add-dialog.c b/gtk/add-dialog.c
index 968350606..2849ca2a3 100644
--- a/gtk/add-dialog.c
+++ b/gtk/add-dialog.c
@@ -128,7 +128,7 @@ addResponseCB( GtkDialog * dialog,
 
             if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->trash_check ) ) )
 
-                tr_file_trash_or_unlink( data->filename );
+                tr_file_trash_or_remove( data->filename );
             save_recent_destination( data->core, data->downloadDir );
         }
     }
diff --git a/gtk/tr-torrent.c b/gtk/tr-torrent.c
index 9cac97422..48497e38a 100644
--- a/gtk/tr-torrent.c
+++ b/gtk/tr-torrent.c
@@ -212,7 +212,7 @@ tr_torrent_new_ctor( tr_session   * session,
 
         /* #1294: don't delete the source .torrent file if it's our internal copy */
         if( !is_internal )
-            tr_file_trash_or_unlink( source );
+            tr_file_trash_or_remove( source );
     }
 
     if( !tor )
@@ -318,7 +318,7 @@ tr_torrent_set_remove_flag( TrTorrent * gtor,
 void
 tr_torrent_delete_files( TrTorrent * gtor )
 {
-    tr_torrentDeleteLocalData( tr_torrent_handle( gtor ), tr_file_trash_or_unlink );
+    tr_torrentDeleteLocalData( tr_torrent_handle( gtor ), tr_file_trash_or_remove );
 }
 
 void
diff --git a/gtk/util.c b/gtk/util.c
index 691907636..11a3c3b29 100644
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -516,7 +516,7 @@ tr_object_ref_sink( gpointer object )
 }
 
 int
-tr_file_trash_or_unlink( const char * filename )
+tr_file_trash_or_remove( const char * filename )
 {
     if( filename && *filename )
     {
@@ -529,14 +529,12 @@ tr_file_trash_or_unlink( const char * filename )
             g_message( "Unable to trash file \"%s\": %s", filename, err->message );
         g_clear_error( &err );
         g_object_unref( G_OBJECT( file ) );
-       
-        
 #endif
-        if( !trashed ) {
-            if( g_unlink( filename ) ) {
-                const int err = errno;
-                g_message( "Unable to unlink file \"%s\": %s", filename, g_strerror( err ) );
-            }
+
+        if( !trashed && g_remove( filename ) )
+        {
+            const int err = errno;
+            g_message( "Unable to remove file \"%s\": %s", filename, g_strerror( err ) );
         }
     }
 
diff --git a/gtk/util.h b/gtk/util.h
index abff0d141..b90d3e2d8 100644
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -132,7 +132,7 @@ gboolean    on_tree_view_button_released( GtkWidget *      view,
 
 gpointer    tr_object_ref_sink( gpointer object );
 
-int         tr_file_trash_or_unlink( const char * filename );
+int         tr_file_trash_or_remove( const char * filename );
 
 #endif /* GTK_MAJOR_VERSION */