[GNUnet-SVN] r985 - GNUnet/src/conf

[durner]

Author: durner
Date: 2005-06-24 12:40:44 -0700 (Fri, 24 Jun 2005)
New Revision: 985

Modified:
   GNUnet/src/conf/wizard.c
   GNUnet/src/conf/wizard.glade
   GNUnet/src/conf/wizard_interface.c
Log:
Editable ComboBox for NICs because ifconfig may not be available

Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c    2005-06-24 19:08:21 UTC (rev 984)
+++ GNUnet/src/conf/wizard.c    2005-06-24 19:40:44 UTC (rev 985)
@@ -42,12 +42,13 @@
 int doOpenEnhConfigurator = 0;
 int doAutoStart = 0;
 char *user_name = NULL, *group_name = NULL;
+static int nic_item_count = 0;
 
 int gconf_main(int ac, char *av[]);
 
 void insert_nic(char *name, int defaultNIC)
 {
-  gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), name);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), name);
   
        defaultNIC = wiz_is_nic_default(name, defaultNIC);
   
@@ -67,6 +68,8 @@
        gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmbNIC), &last);
        on_cmbNIC_changed(GTK_COMBO_BOX(cmbNIC), NULL);
   }
+
+       nic_item_count++;
 }
 
 void load_step2()
@@ -89,9 +92,30 @@
 
        sym = sym_find("INTERFACE", "NETWORK");
        if (sym)
-       {               
+       {
+               nic_item_count = 0;
                wiz_enum_nics(insert_nic);
 
+               if (!nic_item_count)
+               {
+                       /* ifconfig unavailable */
+               GtkTreeIter iter;
+               GtkTreeModel *model;
+               char *nic;
+               
+                       sym_calc_value_ext(sym, 1);
+                       nic = sym_get_string_value(sym);
+
+                       if (!nic)
+                               nic = "eth0";
+                       gtk_combo_box_append_text(cmbNIC, nic);
+                       
+               model = gtk_combo_box_get_model(GTK_COMBO_BOX(cmbNIC));         
        
+               gtk_tree_model_get_iter_first(model, &iter);
+               gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmbNIC), &iter);
+               on_cmbNIC_changed(GTK_COMBO_BOX(cmbNIC), NULL);                 
+               }
+
                gtk_widget_set_usize(cmbNIC, 10, -1);
        }
 

Modified: GNUnet/src/conf/wizard.glade
===================================================================
--- GNUnet/src/conf/wizard.glade        2005-06-24 19:08:21 UTC (rev 984)
+++ GNUnet/src/conf/wizard.glade        2005-06-24 19:40:44 UTC (rev 985)
@@ -425,21 +425,6 @@
                          </child>
 
                          <child>
-                           <widget class="GtkComboBox" id="cmbNIC">
-                             <property name="visible">True</property>
-                             <signal name="changed" 
handler="on_cmbNIC_changed" last_modification_time="Sat, 16 Apr 2005 15:40:51 
GMT"/>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="x_options">shrink|fill</property>
-                             <property name="y_options">fill</property>
-                           </packing>
-                         </child>
-
-                         <child>
                            <widget class="GtkCheckButton" id="chkFW">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
@@ -461,6 +446,21 @@
                              <property name="y_options"></property>
                            </packing>
                          </child>
+
+                         <child>
+                           <widget class="GtkComboBoxEntry" id="cmbNIC">
+                             <property name="visible">True</property>
+                             <signal name="changed" 
handler="on_cmbNIC_changed" last_modification_time="Fri, 24 Jun 2005 19:32:04 
GMT"/>
+                           </widget>
+                           <packing>
+                             <property name="left_attach">1</property>
+                             <property name="right_attach">2</property>
+                             <property name="top_attach">0</property>
+                             <property name="bottom_attach">1</property>
+                             <property name="x_options">shrink|fill</property>
+                             <property name="y_options">fill</property>
+                           </packing>
+                         </child>
                        </widget>
                        <packing>
                          <property name="padding">0</property>

Modified: GNUnet/src/conf/wizard_interface.c
===================================================================
--- GNUnet/src/conf/wizard_interface.c  2005-06-24 19:08:21 UTC (rev 984)
+++ GNUnet/src/conf/wizard_interface.c  2005-06-24 19:40:44 UTC (rev 985)
@@ -172,8 +172,8 @@
   GtkWidget *label23;
   GtkWidget *label24;
   GtkWidget *entIP;
+  GtkWidget *chkFW;
   GtkWidget *cmbNIC;
-  GtkWidget *chkFW;
   GtkWidget *labelLimit;
   GtkWidget *hbuttonbox2;
   GtkWidget *step2_back;
@@ -268,12 +268,6 @@
                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                    (GtkAttachOptions) (0), 0, 0);
 
-  cmbNIC = gtk_combo_box_new_text ();
-  gtk_widget_show (cmbNIC);
-  gtk_table_attach (GTK_TABLE (table1), cmbNIC, 1, 2, 0, 1,
-                   (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
-                   (GtkAttachOptions) (GTK_FILL), 0, 0);
-
   chkFW =
     gtk_check_button_new_with_mnemonic (_
                                        ("Computer cannot receive inbound 
connections (SNAT/Firewall)"));
@@ -282,6 +276,12 @@
                    (GtkAttachOptions) (GTK_FILL),
                    (GtkAttachOptions) (0), 0, 0);
 
+  cmbNIC = gtk_combo_box_entry_new_text ();
+  gtk_widget_show (cmbNIC);
+  gtk_table_attach (GTK_TABLE (table1), cmbNIC, 1, 2, 0, 1,
+                   (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
+                   (GtkAttachOptions) (GTK_FILL), 0, 0);
+
   labelLimit = gtk_label_new (_("Network connection"));
   gtk_widget_show (labelLimit);
   gtk_frame_set_label_widget (GTK_FRAME (frame1), labelLimit);
@@ -358,10 +358,10 @@
                    G_CALLBACK (on_assi_destroy), NULL);
   g_signal_connect ((gpointer) entIP, "changed",
                    G_CALLBACK (on_entIP_changed), NULL);
+  g_signal_connect ((gpointer) chkFW, "toggled",
+                   G_CALLBACK (on_chkFW_toggled), NULL);
   g_signal_connect ((gpointer) cmbNIC, "changed",
                    G_CALLBACK (on_cmbNIC_changed), NULL);
-  g_signal_connect ((gpointer) chkFW, "toggled",
-                   G_CALLBACK (on_chkFW_toggled), NULL);
   g_signal_connect ((gpointer) step2_back, "clicked",
                    G_CALLBACK (on_step2_back_clicked), NULL);
   g_signal_connect ((gpointer) step2_next, "clicked",
@@ -383,8 +383,8 @@
   GLADE_HOOKUP_OBJECT (assi_step2, label23, "label23");
   GLADE_HOOKUP_OBJECT (assi_step2, label24, "label24");
   GLADE_HOOKUP_OBJECT (assi_step2, entIP, "entIP");
+  GLADE_HOOKUP_OBJECT (assi_step2, chkFW, "chkFW");
   GLADE_HOOKUP_OBJECT (assi_step2, cmbNIC, "cmbNIC");
-  GLADE_HOOKUP_OBJECT (assi_step2, chkFW, "chkFW");
   GLADE_HOOKUP_OBJECT (assi_step2, labelLimit, "labelLimit");
   GLADE_HOOKUP_OBJECT (assi_step2, hbuttonbox2, "hbuttonbox2");
   GLADE_HOOKUP_OBJECT (assi_step2, step2_back, "step2_back");