[GNUnet-SVN] r15478 - in gnunet-setup: contrib src

[gnunet]

Author: grothoff
Date: 2011-06-08 22:54:03 +0200 (Wed, 08 Jun 2011)
New Revision: 15478

Modified:
   gnunet-setup/contrib/gnunet-setup.glade
   gnunet-setup/src/gnunet-setup-options.c
Log:
remove ttl

Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade     2011-06-08 20:52:05 UTC (rev 
15477)
+++ gnunet-setup/contrib/gnunet-setup.glade     2011-06-08 20:54:03 UTC (rev 
15478)
@@ -3372,20 +3372,6 @@
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_ttl_treeviewcolumn">
-                                        <property 
name="sizing">autosize</property>
-                                        <property name="title" 
translatable="yes">TTL</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_ttl_cellrenderertext">
-                                            <property 
name="editable">True</property>
-                                          </object>
-                                          <attributes>
-                                            <attribute 
name="text">4</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
                                       <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_altnames_treeviewcolumn">
                                         <property 
name="sizing">autosize</property>
                                         <property name="title" 
translatable="yes">Alt. Names</property>
@@ -3395,7 +3381,7 @@
                                             <property 
name="wrap_mode">word</property>
                                           </object>
                                           <attributes>
-                                            <attribute 
name="text">5</attribute>
+                                            <attribute 
name="text">4</attribute>
                                           </attributes>
                                         </child>
                                       </object>
@@ -3632,8 +3618,6 @@
       <!-- column-name targetport -->
       <column type="guint"/>
       <!-- column-name targethostname -->
-      <column type="gchararray"/>
-      <!-- column-name ttl -->
       <column type="guint"/>
       <!-- column-name altnames -->
       <column type="gchararray"/>

Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c     2011-06-08 20:52:05 UTC (rev 
15477)
+++ gnunet-setup/src/gnunet-setup-options.c     2011-06-08 20:54:03 UTC (rev 
15478)
@@ -619,7 +619,6 @@
 {
   GtkListStore *ls = cls;
   char *sld;
-  long long unsigned int ttl;
   char *altnames;
   char *hostname;
   char *hostport;
@@ -632,9 +631,6 @@
   sld = GNUNET_strdup (section);
   sld[strlen (section) - 8] = '\0';
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, section, "TTL", &ttl))    
-    ttl = 3600; /* sensible default */
-  if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg, section,
                                             "ALTERNATIVE_NAMES", &altnames))
     altnames = GNUNET_strdup (""); /* empty */
@@ -685,9 +681,8 @@
                                                 1, (guint) local_port,
                                                 2, atoi (hostport),
                                                 3, hostname,
-                                                4, (guint) ttl,
-                                                5, altnames, 
-                                                6, udp,
+                                                4, altnames, 
+                                                5, udp,
                                                 -1);
            }
          GNUNET_free (cpy);
@@ -749,7 +744,6 @@
   guint srcport;
   guint targetport;
   gchar *targethost;
-  guint ttl;
   gchar *altnames;
   gboolean isudp;
 
@@ -765,9 +759,8 @@
                            1, &srcport,
                            2, &targetport,
                            3, &targethost,
-                           4, &ttl,
-                           5, &altnames,
-                           6, &isudp,
+                           4, &altnames,
+                           5, &isudp,
                            -1);
        /* FIXME: update cfg! */
        g_free (hostname);