diff --git a/gtk/tr-core.c b/gtk/tr-core.c index 8e16f3949..ff281d105 100644 --- a/gtk/tr-core.c +++ b/gtk/tr-core.c @@ -499,10 +499,6 @@ tr_core_apply_defaults( tr_ctor * ctor ) if( tr_ctorGetPaused( ctor, TR_FORCE, NULL ) ) tr_ctorSetPaused( ctor, TR_FORCE, !pref_flag_get( PREF_KEY_START ) ); - if( tr_ctorGetDeleteSource( ctor, NULL ) ) - tr_ctorSetDeleteSource( ctor, - pref_flag_get( PREF_KEY_DELETE_ORIGINAL ) ); - if( tr_ctorGetMaxConnectedPeers( ctor, TR_FORCE, NULL ) ) tr_ctorSetMaxConnectedPeers( ctor, TR_FORCE, pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) ); diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c index fad1888cf..7ffffda52 100644 --- a/gtk/tr-prefs.c +++ b/gtk/tr-prefs.c @@ -71,7 +71,6 @@ tr_prefs_init_global( void ) pref_flag_set_default ( PREF_KEY_MINIMAL_VIEW, FALSE ); pref_flag_set_default ( PREF_KEY_START, TRUE ); - pref_flag_set_default ( PREF_KEY_DELETE_ORIGINAL, FALSE ); pref_save( NULL ); } @@ -206,29 +205,6 @@ dialogDestroyed( gpointer alive, GObject * dialog UNUSED ) *(gboolean*)alive = FALSE; } -static GtkWidget* -generalPage( GObject * core ) -{ - int row = 0; - const char * s; - GtkWidget * t; - GtkWidget * w; - - t = hig_workarea_create( ); - hig_workarea_add_section_title( t, &row, _( "Windows" ) ); - - s = _("Show an _icon in the system tray"); - w = new_check_button( s, PREF_KEY_SYSTRAY, core ); - hig_workarea_add_wide_control( t, &row, w ); - - s = _("Confirm _quit"); - w = new_check_button( s, PREF_KEY_ASKQUIT, core ); - hig_workarea_add_wide_control( t, &row, w ); - - hig_workarea_finish( t, &row ); - return t; -} - static GtkWidget* torrentPage( GObject * core ) { @@ -251,10 +227,6 @@ torrentPage( GObject * core ) w = new_check_button( s, PREF_KEY_START, core ); hig_workarea_add_wide_control( t, &row, w ); - s = _( "_Delete original torrent file" ); - w = new_check_button( s, PREF_KEY_DELETE_ORIGINAL, core ); - hig_workarea_add_wide_control( t, &row, w ); - #ifdef HAVE_LIBNOTIFY hig_workarea_add_section_divider( t, &row ); hig_workarea_add_section_title( t, &row, _( "Notification" ) ); @@ -382,9 +354,6 @@ tr_prefs_dialog_new( GObject * core, GtkWindow * parent ) gtk_notebook_append_page( GTK_NOTEBOOK( n ), networkPage( core, alive ), gtk_label_new (_("Network")) ); - gtk_notebook_append_page( GTK_NOTEBOOK( n ), - generalPage( core ), - gtk_label_new (_("General")) ); g_signal_connect( d, "response", G_CALLBACK(response_cb), core ); gtk_box_pack_start_defaults( GTK_BOX(GTK_DIALOG(d)->vbox), n ); diff --git a/gtk/tr-prefs.h b/gtk/tr-prefs.h index 52a8cd1d1..addc8d868 100644 --- a/gtk/tr-prefs.h +++ b/gtk/tr-prefs.h @@ -27,7 +27,6 @@ GtkWidget * tr_prefs_dialog_new( GObject * core, GtkWindow * parent ); #define PREF_KEY_OPTIONS_PROMPT "show-options-window" #define PREF_KEY_DIR_DEFAULT "default-download-directory" #define PREF_KEY_START "start-added-torrents" -#define PREF_KEY_DELETE_ORIGINAL "delete-original-torrent-files" #define PREF_KEY_PORT "listening-port" #define PREF_KEY_NAT "nat-traversal-enabled" #define PREF_KEY_PEX "pex-enabled"