[GNUnet-SVN] r888 - in GNUnet: contrib src/conf

[durner]

Author: durner
Date: 2005-06-08 12:07:22 -0700 (Wed, 08 Jun 2005)
New Revision: 888

Modified:
   GNUnet/contrib/config-daemon.in
   GNUnet/src/conf/wizard.c
   GNUnet/src/conf/wizard_callbacks.c
   GNUnet/src/conf/wizard_curs.c
Log:
fixes

Modified: GNUnet/contrib/config-daemon.in
===================================================================
--- GNUnet/contrib/config-daemon.in     2005-06-08 17:53:25 UTC (rev 887)
+++ GNUnet/contrib/config-daemon.in     2005-06-08 19:07:22 UTC (rev 888)
@@ -164,7 +164,7 @@
   config HTTP-PROXY-PORT
   int "HTTP Proxy Port"
   range 1 65535
-  default ""
+  default 1080
   depends on Meta::ADVANCED
   help
                If you have to use a proxy for outbound HTTP connections,
@@ -348,7 +348,7 @@
 
   config INTERFACES
   string "Network interface to monitor"
-  depends on Meta::ADVANCEDLIMITING
+  depends on !Meta::BASICLIMITING
   help
                For which interfaces should we do accounting?  GNUnet will 
evaluate
                the total traffic (not only the GNUnet related traffic) and 
adjust

Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c    2005-06-08 17:53:25 UTC (rev 887)
+++ GNUnet/src/conf/wizard.c    2005-06-08 19:07:22 UTC (rev 888)
@@ -33,6 +33,7 @@
 
 #include "wizard_interface.h"
 #include "wizard_support.h"
+#include "wizard_callbacks.h"
 #include "wizard_util.h"
 
 GtkWidget *curwnd;
@@ -64,6 +65,7 @@
        }
        
        gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmbNIC), &last);
+       on_cmbNIC_changed(GTK_COMBO_BOX(cmbNIC), NULL);
   }
 }
 
@@ -216,7 +218,7 @@
        chkStart = lookup_widget(vbox14, "chkStart");
        chkEnh = lookup_widget(vbox14, "chkEnh");
        
-       sym = sym_find("DISKQUOTA", "FS");
+       sym = sym_find("QUOTA", "FS");
        if (sym)
        {
                sym_calc_value_ext(sym, 1);
@@ -245,6 +247,8 @@
 int
 wizard_main (int argc, char *argv[])
 {
+       struct symbol *sym;
+       
 #ifdef ENABLE_NLS
                /* GTK uses UTF-8 encoding */
                bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -260,6 +264,13 @@
        conf_parse(DATADIR"/config.in");
          
   conf_read(NULL);
+  
+  sym = sym_find("EXPERIMENTAL", "Meta");
+  sym_set_tristate_value(sym, yes);
+  sym = sym_find("ADVANCED", "Meta");
+  sym_set_tristate_value(sym, yes);
+  sym = sym_find("RARE", "Meta");
+  sym_set_tristate_value(sym, yes);
 
   curwnd = create_assi_step1 ();
   gtk_widget_show (curwnd);

Modified: GNUnet/src/conf/wizard_callbacks.c
===================================================================
--- GNUnet/src/conf/wizard_callbacks.c  2005-06-08 17:53:25 UTC (rev 887)
+++ GNUnet/src/conf/wizard_callbacks.c  2005-06-08 19:07:22 UTC (rev 888)
@@ -137,6 +137,15 @@
 int
 save_conf ()
 {
+       struct symbol *sym;
+       
+  sym = sym_find("EXPERIMENTAL", "Meta");
+  sym_set_tristate_value(sym, no);
+  sym = sym_find("ADVANCED", "Meta");
+  sym_set_tristate_value(sym, no);
+  sym = sym_find("RARE", "Meta");
+  sym_set_tristate_value(sym, no);
+       
        if (conf_write())
        {
                msgSaveFailed = create_msgSaveFailed();
@@ -292,7 +301,7 @@
 void
 on_chkMigr_toggled (GtkToggleButton * togglebutton, gpointer user_data)
 {
-       struct symbol *sym = sym_lookup("ACTIVEMIGRATION", "AFS", 0);
+       struct symbol *sym = sym_lookup("ACTIVEMIGRATION", "FS", 0);
        sym_set_tristate_value(sym,
                gtk_toggle_button_get_active(togglebutton) ? yes : no);
 }
@@ -300,7 +309,7 @@
 void
 on_entQuota_changed (GtkEditable * editable, gpointer user_data)
 {
-       struct symbol *sym = sym_lookup("DISKQUOTA", "AFS", 0);
+       struct symbol *sym = sym_lookup("QUOTA", "FS", 0);
        sym_set_string_value(sym, gtk_editable_get_chars(editable, 0, -1));
 }
 

Modified: GNUnet/src/conf/wizard_curs.c
===================================================================
--- GNUnet/src/conf/wizard_curs.c       2005-06-08 17:53:25 UTC (rev 887)
+++ GNUnet/src/conf/wizard_curs.c       2005-06-08 19:07:22 UTC (rev 888)
@@ -329,7 +329,7 @@
        dialog_clear();
 
        /* Quota */
-       if ((sym = sym_find("DISKQUOTA", "FS"))) {
+       if ((sym = sym_find("QUOTA", "FS"))) {
                sym_calc_value_ext(sym, 1);
                defval = (char *) sym_get_string_value(sym);
        }
@@ -463,6 +463,13 @@
 
        init_dialog();
        dialog_clear();
+       
+  sym = sym_find("EXPERIMENTAL", "Meta");
+  sym_set_tristate_value(sym, no);
+  sym = sym_find("ADVANCED", "Meta");
+  sym_set_tristate_value(sym, no);
+  sym = sym_find("RARE", "Meta");
+  sym_set_tristate_value(sym, no);
 
        while(true) {
                if (conf_write() != 0) {