mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-12 07:03:44 +00:00
Code Issues Releases Wiki Activity

(trunk gtk) use g_remove() instead of g_unlink() so that folders can be deleted too

Browse source
This commit is contained in:
Charles Kerr 2009-01-22 20:46:21 +00:00
parent 300c425a44
commit 33aab046f5
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gtk/add-dialog.c
View file

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

4
gtk/tr-torrent.c
View file

@ -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

12
gtk/util.c
View file

@ -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 ) ) {
if( !trashed && g_remove( filename ) )
{
const int err = errno;
g_message( "Unable to unlink file \"%s\": %s", filename, g_strerror( err ) );
}
g_message( "Unable to remove file \"%s\": %s", filename, g_strerror( err ) );
}
}

2
gtk/util.h
View file

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