Changeset 6162 for trunk/gtk/tr-prefs.c

Timestamp:

Jun 12, 2008, 4:25:36 PM (14 years ago)

Author:

charles

Message:

unify the daemon and gtk client's config files so that you can easily swap back and forth between clients and keep the same torrents and preferences.

File:

• trunk/gtk/tr-prefs.c (modified) (9 diffs)

trunk/gtk/tr-prefs.c

@@ -94 +94 @@
     pref_int_set_default    ( PREF_KEY_PORT, TR_DEFAULT_PORT );
 
-    pref_flag_set_default   ( PREF_KEY_NAT, TRUE );
+    pref_flag_set_default   ( PREF_KEY_PORT_FORWARDING, TRUE );
     pref_flag_set_default   ( PREF_KEY_PEX, TR_DEFAULT_PEX_ENABLED );
     pref_flag_set_default   ( PREF_KEY_ASKQUIT, TRUE );
-    pref_flag_set_default   ( PREF_KEY_ENCRYPTED_ONLY, FALSE );
+    pref_flag_set_default   ( PREF_KEY_ENCRYPTION, TR_ENCRYPTION_PREFERRED );
 
     pref_int_set_default    ( PREF_KEY_MSGLEVEL, TR_MSG_INF );
@@ -119 +119 @@
     pref_flag_set_default  ( PREF_KEY_RPC_AUTH_ENABLED, FALSE );
 
-    pref_save( NULL );
+    pref_save( );
 }
 
@@ -192 +192 @@
 {
     GtkWidget * w = gtk_entry_new( );
-    char * value = pref_string_get( key );
+    const char * value = pref_string_get( key );
     if( value )
         gtk_entry_set_text( GTK_ENTRY( w ), value );
     g_object_set_data_full( G_OBJECT(w), PREF_KEY, g_strdup(key), g_free );
     g_signal_connect( w, "changed", G_CALLBACK(entry_changed_cb), core );
-    g_free( value );
     return w;
 }
@@ -215 +214 @@
     GtkWidget * w = gtk_file_chooser_button_new( NULL,
                                     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
-    char * path = pref_string_get( key );
+    const char * path = pref_string_get( key );
     g_object_set_data_full( G_OBJECT(w), PREF_KEY, g_strdup(key), g_free );
     g_signal_connect( w, "selection-changed", G_CALLBACK(chosen_cb), core );
     gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(w), path );
-    g_free( path );
     return w;
 }
@@ -497 +495 @@
 }
 
+static void
+onEncryptionToggled( GtkToggleButton * w, gpointer core )
+{
+    const int val = gtk_toggle_button_get_active( w )
+                  ? TR_ENCRYPTION_REQUIRED
+                  : TR_ENCRYPTION_PREFERRED;
+    tr_core_set_pref_int( TR_CORE( core ), PREF_KEY_ENCRYPTION, val );
+}
+
 static GtkWidget*
 peerPage( GObject * core, gboolean * alive )
@@ -531 +538 @@
         
         s = _("_Ignore unencrypted peers");
-        w = new_check_button( s, PREF_KEY_ENCRYPTED_ONLY, core );
+        w = gtk_check_button_new_with_mnemonic( s );
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w),
+                                      pref_int_get(PREF_KEY_ENCRYPTION)==TR_ENCRYPTION_REQUIRED );
+        g_signal_connect( w, "toggled", G_CALLBACK(onEncryptionToggled), core );
         hig_workarea_add_wide_control( t, &row, w );
 
@@ -811 +821 @@
         /* access control list */
         {
-        char * val = pref_string_get( PREF_KEY_RPC_ACL );
+        const char * val = pref_string_get( PREF_KEY_RPC_ACL );
         GtkTreeModel * m = acl_tree_model_new( val );
         GtkTreeViewColumn * c;
@@ -853 +863 @@
         gtk_misc_set_alignment( GTK_MISC( w ), 0.0f, 0.1f );
         page->widgets = g_slist_append( page->widgets, w );
-        g_free( val );
 
         /* permission column */
@@ -972 +981 @@
 
         s = _("Use port _forwarding from my router" );
-        w = new_check_button( s, PREF_KEY_NAT, core );
+        w = new_check_button( s, PREF_KEY_PORT_FORWARDING, core );
         hig_workarea_add_wide_control( t, &row, w );