Changeset 7776

Timestamp:

Jan 22, 2009, 10:04:37 PM (13 years ago)

Author:

charles

Message:

(1.5x) backport r7774 and r7775 (the unlink -> remove changes in libtransmission and gtk) in preparation for 1.50b3

Location:

branches/1.5x

Files:

• gtk/add-dialog.c (modified) (1 diff)
• gtk/tr-torrent.c (modified) (2 diffs)
• gtk/util.c (modified) (2 diffs)
• gtk/util.h (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)

branches/1.5x/gtk/add-dialog.c

@@ -129 +129 @@
             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 );
         }

branches/1.5x/gtk/tr-torrent.c

@@ -213 +213 @@
         /* #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 );
     }
 
@@ -319 +319 @@
 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 );
 }
 

branches/1.5x/gtk/util.c

@@ -517 +517 @@
 
 int
-tr_file_trash_or_unlink( const char * filename )
+tr_file_trash_or_remove( const char * filename )
 {
     if( filename && *filename )
@@ -530 +530 @@
         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 ) );
-            }
+#endif
+
+        if( !trashed && g_remove( filename ) )
+        {
+            const int err = errno;
+            g_message( "Unable to remove file \"%s\": %s", filename, g_strerror( err ) );
         }
     }

branches/1.5x/gtk/util.h

@@ -133 +133 @@
 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 */

branches/1.5x/libtransmission/torrent.c

@@ -1899 +1899 @@
 {
     if( fileFunc == NULL )
-        fileFunc = unlink;
+        fileFunc = remove;
 
     /* close all the files because we're about to delete them */