Changeset 3209

Timestamp:

Sep 28, 2007, 12:46:22 AM (15 years ago)

Author:

charles

Message:

now that the gtk+ prefs are unfucked, add an "ignore unencrypted peers" preference.

Location:

trunk/gtk

Files:

• conf.c (modified) (5 diffs)
• main.c (modified) (3 diffs)
• tr_prefs.c (modified) (10 diffs)
• tr_prefs.h (modified) (3 diffs)

trunk/gtk/conf.c

@@ -36 +36 @@
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 
 #include <libtransmission/transmission.h>
@@ -159 +160 @@
 
 static void
-cf_removelocks(void) {
-  if(NULL != gl_lockpath) {
-    unlink(gl_lockpath);
-    g_free(gl_lockpath);
-  }
-
-  if(NULL != gl_old_lockpath) {
-    unlink(gl_old_lockpath);
-    g_free(gl_old_lockpath);
-  }
+cf_removelocks( void )
+{
+    g_unlink( gl_lockpath );
+    g_free( gl_lockpath );
+    g_unlink( gl_old_lockpath );
+    g_free( gl_old_lockpath );
 }
 
@@ -232 +229 @@
 getPrefsFilename( void )
 {
-    return g_build_filename( tr_getPrefsDirectory(), "gtk", "prefs", NULL );
+    return g_build_filename( tr_getPrefsDirectory(),
+                             CONF_SUBDIR, "prefs.ini", NULL );
 }
 
@@ -305 +303 @@
 pref_save(char **errstr)
 {
+    gsize datalen;
     GError * err = NULL;
-    gsize datalen;
     char * data;
-    char * filename = getPrefsFilename( );
+    char * filename;
+    char * path;
+
+    filename = getPrefsFilename( );
+    path = g_path_get_dirname( filename );
+    mkdir_p( path, 0755 );
 
     data = g_key_file_to_data( getPrefsKeyFile(), &datalen, &err );
@@ -320 +323 @@
         *errstr = err ? g_strdup( err->message ) : NULL;
 
+    g_clear_error( &err );
+    g_free( data );
+    g_free( path );
     g_free( filename );
-    g_free( data );
-    g_clear_error( &err );
 }
 

trunk/gtk/main.c

@@ -748 +748 @@
         PREF_KEY_NAT,
         PREF_KEY_PEX,
-        PREF_KEY_SYSTRAY
+        PREF_KEY_SYSTRAY,
+        PREF_KEY_ENCRYPTED_ONLY
     };
 
@@ -761 +762 @@
     tr_handle     * tr     = tr_core_handle( cbdata->core );
 
-    if( !strcmp( key, PREF_KEY_PORT ) )
+    if( !strcmp( key, PREF_KEY_ENCRYPTED_ONLY ) )
+    {
+        const gboolean crypto_only = pref_flag_get( key );
+        tr_setEncryptionMode( tr, crypto_only ? TR_ENCRYPTION_REQUIRED
+                                              : TR_ENCRYPTION_PREFERRED );
+    }
+    else if( !strcmp( key, PREF_KEY_PORT ) )
     {
         const int port = pref_int_get( key );
@@ -793 +800 @@
     else if( !strcmp( key, PREF_KEY_SYSTRAY ) )
     {
-        if( pref_flag_get( key ) ) {
+        if( pref_flag_get( key ) )
+        {
             makeicon( cbdata );
-        } else if( cbdata->icon ) {
+        }
+        else if( cbdata->icon )
+        {
             g_object_unref( cbdata->icon );
             cbdata->icon = NULL;

trunk/gtk/tr_prefs.c

@@ -8 +8 @@
  * the Transmission project.
  * 
- * $Id:$
+ * $Id$
  */
 
@@ -41 +41 @@
     pref_flag_set_default   ( PREF_KEY_SYSTRAY, TRUE );
     pref_flag_set_default   ( PREF_KEY_ASKQUIT, TRUE );
+    pref_flag_set_default   ( PREF_KEY_ENCRYPTED_ONLY, FALSE );
 
     pref_string_set_default ( PREF_KEY_ADDSTD, toractionname(TR_TOR_COPY) );
@@ -130 +131 @@
 new_path_chooser_button( const char * key, gpointer core )
 {
-    GtkWidget * w = gtk_file_chooser_button_new( "asdf", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
+    GtkWidget * w = gtk_file_chooser_button_new( NULL,
+                                    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
     char * path = pref_string_get( key );
     g_object_set_data_full( G_OBJECT(w), PREFS_KEY, g_strdup(key), g_free );
@@ -155 +157 @@
 new_action_combo( const char * key, gpointer core )
 {
+    const char * s;
     GtkTreeIter iter;
     GtkCellRenderer * rend;
@@ -161 +164 @@
 
     model = gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_INT );
+
+    s = _("Use the torrent file where it is");
     gtk_list_store_append( model, &iter );
-    gtk_list_store_set( model, &iter, 1, TR_TOR_LEAVE, 0,
-                        _("Use the torrent file where it is"), -1 );
+    gtk_list_store_set( model, &iter, 1, TR_TOR_LEAVE, 0, s, -1 );
+
+    s = _("Keep a copy of the torrent file");
     gtk_list_store_append( model, &iter );
-    gtk_list_store_set( model, &iter, 1, TR_TOR_COPY, 0,
-                        _("Keep a copy of the torrent file"), -1 );
+    gtk_list_store_set( model, &iter, 1, TR_TOR_COPY, 0, s, -1 );
+
+    s = _("Keep a copy and remove the original");
     gtk_list_store_append( model, &iter );
-    gtk_list_store_set( model, &iter, 1, TR_TOR_MOVE, 0,
-                        _("Keep a copy and remove the original"), -1 );
+    gtk_list_store_set( model, &iter, 1, TR_TOR_MOVE, 0, s, -1 );
 
     w = gtk_combo_box_new_with_model( GTK_TREE_MODEL(model) ); 
-    gtk_combo_box_set_active( GTK_COMBO_BOX(w), pref_int_get(key) );
+    gtk_combo_box_set_active( GTK_COMBO_BOX(w), tr_prefs_get_action(key) );
     g_object_set_data_full( G_OBJECT(w), PREFS_KEY, g_strdup(key), g_free );
     rend = gtk_cell_renderer_text_new( );
@@ -186 +192 @@
 {
     int row = 0;
+    const char * s;
     GtkWidget * t;
     GtkWidget * w;
     GtkWidget * l;
-    GtkWidget * dialog = gtk_dialog_new_with_buttons( _("Transmission: Preferences"), parent,
-                                                      GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                      GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-                                                      NULL );
-    gtk_window_set_role( GTK_WINDOW(dialog), "transmission-preferences-dialog" );
-    g_signal_connect( dialog, "response", G_CALLBACK(response_cb), core );
+    GtkWidget * d;
+
+    d = gtk_dialog_new_with_buttons( _("Transmission: Preferences"), parent,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                     NULL );
+
+    gtk_window_set_role( GTK_WINDOW(d), "transmission-preferences-dialog" );
+    g_signal_connect( d, "response", G_CALLBACK(response_cb), core );
 
     t = hig_workarea_create ();
@@ -201 +211 @@
     hig_workarea_add_section_spacer (t, row, 4);
 
-        w = new_check_button( _("_Limit Upload Speed"), PREF_KEY_UL_LIMIT_ENABLED, core );
+        s = _("_Limit Upload Speed");
+        w = new_check_button( s, PREF_KEY_UL_LIMIT_ENABLED, core );
         hig_workarea_add_wide_control( t, &row, w );
 
         w = new_spin_button( PREF_KEY_UL_LIMIT, core, 20, INT_MAX );
-        l = hig_workarea_add_row( t, &row, _("Maximum _Upload Speed (KiB/s)"), w, NULL );
-        
-        w = new_check_button( _("Li_mit Download Speed"), PREF_KEY_DL_LIMIT_ENABLED, core );
+        s = _("Maximum _Upload Speed (KiB/s)");
+        l = hig_workarea_add_row( t, &row, s, w, NULL );
+        
+        s = _("Li_mit Download Speed");
+        w = new_check_button( s, PREF_KEY_DL_LIMIT_ENABLED, core );
         hig_workarea_add_wide_control( t, &row, w );
 
         w = new_spin_button( PREF_KEY_DL_LIMIT, core, 1, INT_MAX );
-        l = hig_workarea_add_row( t, &row, _("Maximum _Download Speed (KiB/s)"), w, NULL );
+        s = _("Maximum _Download Speed (KiB/s)");
+        l = hig_workarea_add_row( t, &row, s, w, NULL );
 
     hig_workarea_add_section_divider( t, &row );
@@ -217 +231 @@
     hig_workarea_add_section_spacer (t, row, 4);
 
-        w = new_check_button( _("Al_ways prompt for download directory"), PREF_KEY_DIR_ASK, core );
+        s = _("Al_ways prompt for download directory");
+        w = new_check_button( s, PREF_KEY_DIR_ASK, core );
         hig_workarea_add_wide_control( t, &row, w );
 
         w = new_path_chooser_button( PREF_KEY_DIR_DEFAULT, core );
-        l = hig_workarea_add_row( t, &row, _("Download Di_rectory"), w, NULL );
+        s = _("Download Di_rectory");
+        l = hig_workarea_add_row( t, &row, s, w, NULL );
 
         w = new_action_combo( PREF_KEY_ADDSTD, core );
-        l = hig_workarea_add_row( t, &row, _("For torrents added _normally:"), w, NULL );
+        s = _("For torrents added _normally:");
+        l = hig_workarea_add_row( t, &row, s, w, NULL );
 
         w = new_action_combo( PREF_KEY_ADDIPC, core );
-        l = hig_workarea_add_row( t, &row, _("For torrents added from _command-line:"), w, NULL );
+        s = _("For torrents added from _command-line:");
+        l = hig_workarea_add_row( t, &row, s, w, NULL );
 
     hig_workarea_add_section_divider( t, &row );
@@ -233 +251 @@
     hig_workarea_add_section_spacer (t, row, 2);
         
-        w = new_check_button( _("_Automatic Port Mapping via NAT-PMP or UPnP"), PREF_KEY_NAT, core );
+        s = _("_Automatic Port Mapping via NAT-PMP or UPnP");
+        w = new_check_button( s, PREF_KEY_NAT, core );
         hig_workarea_add_wide_control( t, &row, w );
 
@@ -243 +262 @@
     hig_workarea_add_section_spacer (t, row, 3);
         
-        w = new_check_button( _("Use Peer _Exchange if Possible"), PREF_KEY_PEX, core );
-        hig_workarea_add_wide_control( t, &row, w );
-        
-        w = new_check_button( _("Display an Icon in the System _Tray"), PREF_KEY_SYSTRAY, core );
-        hig_workarea_add_wide_control( t, &row, w );
-        
-        w = new_check_button( _("Confirm _quit"), PREF_KEY_ASKQUIT, core );
+        s = _("Use Peer _Exchange if Possible");
+        w = new_check_button( s, PREF_KEY_PEX, core );
+        hig_workarea_add_wide_control( t, &row, w );
+        
+        s = _("_Ignore Unencrypted Peers");
+        w = new_check_button( s, PREF_KEY_ENCRYPTED_ONLY, core );
+        hig_workarea_add_wide_control( t, &row, w );
+        
+        s = _("Display 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);
-    gtk_box_pack_start_defaults( GTK_BOX(GTK_DIALOG(dialog)->vbox), t );
-    gtk_widget_show_all( GTK_DIALOG(dialog)->vbox );
-    return dialog;
-}
+    gtk_box_pack_start_defaults( GTK_BOX(GTK_DIALOG(d)->vbox), t );
+    gtk_widget_show_all( GTK_DIALOG(d)->vbox );
+    return d;
+}

trunk/gtk/tr_prefs.h

@@ -8 +8 @@
  * the Transmission project.
  * 
- * $Id:$
+ * $Id$
  */
 
@@ -17 +17 @@
 
 GtkWidget * tr_prefs_dialog_new( GObject * core, GtkWindow * parent );
+
+/* if you add a key here,  you /must/ add its
+ * default in tr_prefs_init_global( void ) */
 
 #define PREF_KEY_DL_LIMIT_ENABLED  "download-limit-enabled"
@@ -31 +34 @@
 #define PREF_KEY_SYSTRAY           "system-tray-icon-enabled"
 #define PREF_KEY_ASKQUIT           "prompt-before-exit"
+#define PREF_KEY_ENCRYPTED_ONLY    "encrypted-connections-only"
 #define PREF_KEY_MSGLEVEL          "debug-message-level"