gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r5548 - GNUnet/src/setup/gtk


From: gnunet
Subject: [GNUnet-SVN] r5548 - GNUnet/src/setup/gtk
Date: Sat, 25 Aug 2007 23:43:19 -0600 (MDT)

Author: grothoff
Date: 2007-08-25 23:43:16 -0600 (Sat, 25 Aug 2007)
New Revision: 5548

Modified:
   GNUnet/src/setup/gtk/Makefile.am
   GNUnet/src/setup/gtk/about.c
   GNUnet/src/setup/gtk/gnunet-setup.glade
   GNUnet/src/setup/gtk/ngconf.c
Log:
draft of new gnunet-setup GTK interface

Modified: GNUnet/src/setup/gtk/Makefile.am
===================================================================
--- GNUnet/src/setup/gtk/Makefile.am    2007-08-25 23:55:05 UTC (rev 5547)
+++ GNUnet/src/setup/gtk/Makefile.am    2007-08-26 05:43:16 UTC (rev 5548)
@@ -18,7 +18,7 @@
 
 libgnunetsetup_gtk_la_SOURCES = \
  about.c \
- gconf.c gconf.h \
+ ngconf.c gconf.h \
  glade_support.h glade_support.c \
  wizard_gtk.c wizard_gtk.h
 

Modified: GNUnet/src/setup/gtk/about.c
===================================================================
--- GNUnet/src/setup/gtk/about.c        2007-08-25 23:55:05 UTC (rev 5547)
+++ GNUnet/src/setup/gtk/about.c        2007-08-26 05:43:16 UTC (rev 5548)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2005 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2007 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -41,7 +41,17 @@
   axml = load_xml ("aboutdialog");
   ad = glade_xml_get_widget (axml, "aboutdialog");
   gtk_dialog_run (GTK_DIALOG (ad));
+  gtk_widget_destroy(ad);
   g_object_unref (axml);
 }
 
+/**
+ * Close a window (gtk_widget_destroy).
+ */
+void
+gtk_widget_destroy_setup_gtk (GtkWidget * dummy)
+{
+  gtk_widget_destroy(dummy);
+}
+
 /* end of about.c */

Modified: GNUnet/src/setup/gtk/gnunet-setup.glade
===================================================================
--- GNUnet/src/setup/gtk/gnunet-setup.glade     2007-08-25 23:55:05 UTC (rev 
5547)
+++ GNUnet/src/setup/gtk/gnunet-setup.glade     2007-08-26 05:43:16 UTC (rev 
5548)
@@ -1,60 +1,38 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
+  <widget class="GtkWindow" id="assi_step1">
+    <property name="width_request">450</property>
+    <property name="height_request">350</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <signal name="destroy" handler="on_assi_destroy"/>
+    <child>
+      <widget class="GtkVBox" id="vbox2">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkScrolledWindow" id="scoll_welcome">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <child>
+              <widget class="GtkTextView" id="textview11">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="pixels_above_lines">2</property>
+                <property name="pixels_below_lines">2</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">GTK_WRAP_WORD</property>
+                <property name="left_margin">2</property>
+                <property name="right_margin">2</property>
+                <property name="indent">2</property>
+                <property name="cursor_visible">False</property>
+                <property name="accepts_tab">False</property>
+                <property name="text" translatable="yes">Welcome to GNUnet!
 
-<widget class="GtkWindow" id="assi_step1">
-  <property name="width_request">450</property>
-  <property name="height_request">350</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="on_assi_destroy" 
last_modification_time="Fri, 15 Apr 2005 14:27:05 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkScrolledWindow" id="scoll_welcome">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-         <property name="shadow_type">GTK_SHADOW_NONE</property>
-         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-         <child>
-           <widget class="GtkTextView" id="textview11">
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="editable">False</property>
-             <property name="overwrite">False</property>
-             <property name="accepts_tab">False</property>
-             <property name="justification">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap_mode">GTK_WRAP_WORD</property>
-             <property name="cursor_visible">False</property>
-             <property name="pixels_above_lines">2</property>
-             <property name="pixels_below_lines">2</property>
-             <property name="pixels_inside_wrap">0</property>
-             <property name="left_margin">2</property>
-             <property name="right_margin">2</property>
-             <property name="indent">2</property>
-             <property name="text" translatable="yes">Welcome to GNUnet!
-
 This assistant will ask you a few basic questions in order to configure GNUnet.
 
 Please visit our homepage at
@@ -65,1434 +43,833 @@
 Have a lot of fun,
 
 The GNUnet team</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
+              </widget>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHSeparator" id="hseparator2">
+            <property name="visible">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="step1_next">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="load_step2" 
object="assi_step1"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment31">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox54">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image64">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-go-forward</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label85">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Next</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="abort">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_abort_clicked" 
object="assi_step1"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment32">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox55">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image65">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cancel</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label86">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Cancel</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="assi_step2">
+    <property name="width_request">450</property>
+    <property name="height_request">350</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <signal name="destroy" handler="on_assi_destroy"/>
+    <child>
+      <widget class="GtkVBox" id="vbox3">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <child>
+              <widget class="GtkVBox" id="vbox4">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property 
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <child>
+                      <widget class="GtkTextView" id="textview8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">False</property>
+                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                        <property name="left_margin">2</property>
+                        <property name="cursor_visible">False</property>
+                        <property name="text" translatable="yes">Enter 
information about your network connection here.
 
-      <child>
-       <widget class="GtkHSeparator" id="hseparator2">
-         <property name="visible">True</property>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
+The "Network interface" is the device that connects your computer to the 
internet. This is usually a modem, an ISDN card or a network card in case you 
are using DSL.
 
-      <child>
-       <widget class="GtkHButtonBox" id="hbuttonbox1">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-         <property name="spacing">0</property>
-
-         <child>
-           <widget class="GtkButton" id="step1_next">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="load_step2" object="assi_step1" 
last_modification_time="Sun, 14 May 2006 07:53:34 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment31">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox54">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image64">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-go-forward</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label85">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Next</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="abort">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_abort_clicked" 
object="assi_step1" last_modification_time="Thu, 14 Apr 2005 17:32:41 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment32">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox55">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image65">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-cancel</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label86">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Cancel</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="assi_step2">
-  <property name="width_request">450</property>
-  <property name="height_request">350</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="on_assi_destroy" 
last_modification_time="Fri, 15 Apr 2005 14:26:55 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox3">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkFrame" id="frame1">
-         <property name="visible">True</property>
-         <property name="label_xalign">0</property>
-         <property name="label_yalign">0.5</property>
-         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-         <child>
-           <widget class="GtkVBox" id="vbox4">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow5">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTextView" id="textview8">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">False</property>
-                     <property name="overwrite">False</property>
-                     <property name="accepts_tab">True</property>
-                     <property name="justification">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap_mode">GTK_WRAP_WORD</property>
-                     <property name="cursor_visible">False</property>
-                     <property name="pixels_above_lines">0</property>
-                     <property name="pixels_below_lines">0</property>
-                     <property name="pixels_inside_wrap">0</property>
-                     <property name="left_margin">2</property>
-                     <property name="right_margin">0</property>
-                     <property name="indent">0</property>
-                     <property name="text" translatable="yes">Enter 
information about your network connection here.
-
-The &quot;Network interface&quot; is the device that connects your computer to 
the internet. This is usually a modem, an ISDN card or a network card in case 
you are using DSL.
-
-If your provider always assigns the same IP-Address to you (a 
&quot;static&quot; IP-Address), enter it into the &quot;IP-Address&quot; field. 
If your IP-Address changes every now and then (&quot;dynamic&quot; IP-Address) 
but there's a hostname that always points to your actual IP-Address 
(&quot;Dynamic DNS&quot;), you can also enter it here.
+If your provider always assigns the same IP-Address to you (a "static" 
IP-Address), enter it into the "IP-Address" field. If your IP-Address changes 
every now and then ("dynamic" IP-Address) but there's a hostname that always 
points to your actual IP-Address ("Dynamic DNS"), you can also enter it here.
 If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address.
 
-If you are connected to the internet through another computer doing SNAT, a 
router or a &quot;hardware firewall&quot; and other computers on the internet 
cannot connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as &quot;port forwarding&quot;).</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
+If you are connected to the internet through another computer doing SNAT, a 
router or a "hardware firewall" and other computers on the internet cannot 
connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as "port forwarding").</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHSeparator" id="hseparator3">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox5">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox6">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkTable" id="table1">
+                            <property name="visible">True</property>
+                            <property name="border_width">5</property>
+                            <property name="n_rows">3</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">5</property>
+                            <property name="row_spacing">5</property>
+                            <child>
+                              <widget class="GtkComboBoxEntry" id="cmbNIC">
+                                <property name="visible">True</property>
+                                <signal name="changed" 
handler="on_cmbNIC_changed" object="cmbNIC"/>
+                                <child internal-child="entry">
+                                  <widget class="GtkEntry" 
id="comboboxentry-entry1">
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="x_options">GTK_SHRINK | 
GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="chkFW">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" 
translatable="yes">Computer cannot receive inbound connections 
(SNAT/Firewall)</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" 
handler="on_chkFW_toggled" object="chkFW"/>
+                              </widget>
+                              <packing>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="entIP">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">*</property>
+                                <signal name="changed" 
handler="on_entIP_changed" object="entIP"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label24">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" 
translatable="yes">IP-Address/Hostname:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label23">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" 
translatable="yes">Network interface:</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="labelLimit">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Network 
connection</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="step2_next">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="load_step3" 
object="assi_step2"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment41">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox64">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image74">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-go-forward</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label95">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Next</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="step2_abort">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_abort_clicked" 
object="assi_step2"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment42">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox68">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image78">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cancel</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label99">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Cancel</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="assi_step3">
+    <property name="width_request">450</property>
+    <property name="height_request">350</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <signal name="destroy" handler="on_assi_destroy"/>
+    <child>
+      <widget class="GtkVBox" id="vbox7">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkFrame" id="frame3">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <child>
+              <widget class="GtkVBox" id="vbox8">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property 
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <child>
+                      <widget class="GtkTextView" id="textview9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">False</property>
+                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                        <property name="left_margin">2</property>
+                        <property name="cursor_visible">False</property>
+                        <property name="text" translatable="yes">You can limit 
GNUnet's ressource usage here.
 
-             <child>
-               <widget class="GtkHSeparator" id="hseparator3">
-                 <property name="visible">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
+"Bandwidth limitation" is how much data may be sent per second. If you have a 
flatrate you can set it to the maximum speed of your internet connection.
 
-             <child>
-               <widget class="GtkVBox" id="vbox5">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
-                 <child>
-                   <widget class="GtkVBox" id="vbox6">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkTable" id="table1">
-                         <property name="border_width">5</property>
-                         <property name="visible">True</property>
-                         <property name="n_rows">3</property>
-                         <property name="n_columns">2</property>
-                         <property name="homogeneous">False</property>
-                         <property name="row_spacing">5</property>
-                         <property name="column_spacing">5</property>
-
-                         <child>
-                           <widget class="GtkLabel" id="label23">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Network 
interface:</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="label24">
-                             <property name="visible">True</property>
-                             <property name="label" 
translatable="yes">IP-Address/Hostname:</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkEntry" id="entIP">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="editable">True</property>
-                             <property name="visibility">True</property>
-                             <property name="max_length">0</property>
-                             <property name="text" 
translatable="yes"></property>
-                             <property name="has_frame">True</property>
-                             <property name="invisible_char">*</property>
-                             <property 
name="activates_default">False</property>
-                             <signal name="changed" handler="on_entIP_changed" 
object="entIP" last_modification_time="Sat, 16 Apr 2005 15:41:03 GMT"/>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkCheckButton" id="chkFW">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" 
translatable="yes">Computer cannot receive inbound connections 
(SNAT/Firewall)</property>
-                             <property name="use_underline">True</property>
-                             <property 
name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="focus_on_click">True</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="on_chkFW_toggled" 
object="chkFW" last_modification_time="Sun, 17 Apr 2005 15:46:13 GMT"/>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkComboBoxEntry" id="cmbNIC">
-                             <property name="visible">True</property>
-                             <property name="add_tearoffs">False</property>
-                             <property name="has_frame">True</property>
-                             <property name="focus_on_click">True</property>
-                             <signal name="changed" 
handler="on_cmbNIC_changed" object="cmbNIC" 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>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="labelLimit">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Network 
connection</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="type">label_item</property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHButtonBox" id="hbuttonbox2">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-         <property name="spacing">0</property>
-
-         <child>
-           <widget class="GtkButton" id="step2_next">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="load_step3" object="assi_step2" 
last_modification_time="Sun, 14 May 2006 07:57:33 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment41">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox64">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image74">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-go-forward</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label95">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Next</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="step2_abort">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_abort_clicked" 
object="assi_step2" last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment42">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox68">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image78">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-cancel</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label99">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Cancel</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="assi_step3">
-  <property name="width_request">450</property>
-  <property name="height_request">350</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="on_assi_destroy" 
last_modification_time="Fri, 15 Apr 2005 14:27:18 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox7">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkFrame" id="frame3">
-         <property name="visible">True</property>
-         <property name="label_xalign">0</property>
-         <property name="label_yalign">0.5</property>
-         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-         <child>
-           <widget class="GtkVBox" id="vbox8">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow6">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTextView" id="textview9">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">False</property>
-                     <property name="overwrite">False</property>
-                     <property name="accepts_tab">True</property>
-                     <property name="justification">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap_mode">GTK_WRAP_WORD</property>
-                     <property name="cursor_visible">False</property>
-                     <property name="pixels_above_lines">0</property>
-                     <property name="pixels_below_lines">0</property>
-                     <property name="pixels_inside_wrap">0</property>
-                     <property name="left_margin">2</property>
-                     <property name="right_margin">0</property>
-                     <property name="indent">0</property>
-                     <property name="text" translatable="yes">You can limit 
GNUnet's ressource usage here.
-
-&quot;Bandwidth limitation&quot; is how much data may be sent per second. If 
you have a flatrate you can set it to the maximum speed of your internet 
connection.
-
-The &quot;Max. CPU usage&quot; is the percentage of processor time GNUnet is 
allowed to use.</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkHSeparator" id="hseparator4">
-                 <property name="visible">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkVBox" id="vbox9">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
-                 <child>
-                   <widget class="GtkVBox" id="vbox10">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkFrame" id="frame4">
-                         <property name="visible">True</property>
-                         <property name="label_xalign">0</property>
-                         <property name="label_yalign">0.5</property>
-                         <property 
name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-                         <child>
-                           <widget class="GtkHBox" id="hbox24">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">0</property>
-
-                             <child>
-                               <widget class="GtkTable" id="table2">
-                                 <property name="visible">True</property>
-                                 <property name="n_rows">2</property>
-                                 <property name="n_columns">2</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="row_spacing">5</property>
-                                 <property name="column_spacing">5</property>
-
-                                 <child>
-                                   <widget class="GtkLabel" id="label32">
-                                     <property name="visible">True</property>
-                                     <property name="label" 
translatable="yes">Upstream (Bytes/s):</property>
-                                     <property 
name="use_underline">False</property>
-                                     <property 
name="use_markup">False</property>
-                                     <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property 
name="selectable">False</property>
-                                     <property name="xalign">0</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">5</property>
-                                     <property name="ypad">0</property>
-                                     <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property 
name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="left_attach">0</property>
-                                     <property name="right_attach">1</property>
-                                     <property name="top_attach">0</property>
-                                     <property 
name="bottom_attach">1</property>
-                                     <property name="x_options">fill</property>
-                                     <property name="y_options"></property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkEntry" id="entUp">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="editable">True</property>
-                                     <property 
name="visibility">True</property>
-                                     <property name="max_length">0</property>
-                                     <property name="text" 
translatable="yes"></property>
-                                     <property name="has_frame">True</property>
-                                     <property 
name="invisible_char">*</property>
-                                     <property 
name="activates_default">False</property>
-                                     <signal name="changed" 
handler="on_entUp_changed" object="entUp" last_modification_time="Sat, 16 Apr 
2005 16:38:44 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="y_options"></property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkLabel" id="label33">
-                                     <property name="visible">True</property>
-                                     <property name="label" 
translatable="yes">Downstream (Bytes/s):</property>
-                                     <property 
name="use_underline">False</property>
-                                     <property 
name="use_markup">False</property>
-                                     <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property 
name="selectable">False</property>
-                                     <property name="xalign">0</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">5</property>
-                                     <property name="ypad">0</property>
-                                     <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property 
name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="left_attach">0</property>
-                                     <property name="right_attach">1</property>
-                                     <property name="top_attach">1</property>
-                                     <property 
name="bottom_attach">2</property>
-                                     <property name="x_options">fill</property>
-                                     <property name="y_options"></property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkEntry" id="entDown">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="editable">True</property>
-                                     <property 
name="visibility">True</property>
-                                     <property name="max_length">0</property>
-                                     <property name="text" 
translatable="yes"></property>
-                                     <property name="has_frame">True</property>
-                                     <property 
name="invisible_char">*</property>
-                                     <property 
name="activates_default">False</property>
-                                     <signal name="changed" 
handler="on_entDown_changed" object="entDown" last_modification_time="Sat, 16 
Apr 2005 16:38:48 GMT"/>
-                                   </widget>
-                                   <packing>
-                                     <property name="left_attach">1</property>
-                                     <property name="right_attach">2</property>
-                                     <property name="top_attach">1</property>
-                                     <property 
name="bottom_attach">2</property>
-                                     <property name="y_options"></property>
-                                   </packing>
-                                 </child>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">True</property>
-                                 <property name="fill">True</property>
-                               </packing>
-                             </child>
-                           </widget>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="label31">
-                             <property name="visible">True</property>
-                             <property name="label" 
translatable="yes">Bandwidth limitation</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
-                           </widget>
-                           <packing>
-                             <property name="type">label_item</property>
-                           </packing>
-                         </child>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkFrame" id="frame5">
-                         <property name="visible">True</property>
-                         <property name="label_xalign">0</property>
-                         <property name="label_yalign">0.5</property>
-                         <property 
name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-                         <child>
-                           <widget class="GtkVBox" id="vbox11">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">0</property>
-
-                             <child>
-                               <widget class="GtkRadioButton" id="radGNUnet">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label" translatable="yes">Use 
denoted bandwidth for GNUnet</property>
-                                 <property name="use_underline">True</property>
-                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property 
name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
-                                 <property 
name="draw_indicator">True</property>
-                                 <signal name="toggled" 
handler="on_radGNUnet_toggled" object="radGNUnet" last_modification_time="Sat, 
16 Apr 2005 16:38:59 GMT"/>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-
-                             <child>
-                               <widget class="GtkRadioButton" id="radShare">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label" 
translatable="yes">Share denoted bandwidth with other applications</property>
-                                 <property name="use_underline">True</property>
-                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property 
name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
-                                 <property 
name="draw_indicator">True</property>
-                                 <property name="group">radGNUnet</property>
-                                 <signal name="toggled" 
handler="on_radShare_toggled" last_modification_time="Sat, 16 Apr 2005 16:39:03 
GMT"/>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-                           </widget>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="label34">
-                             <property name="visible">True</property>
-                             <property name="label" 
translatable="yes">Bandwidth sharing</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
-                           </widget>
-                           <packing>
-                             <property name="type">label_item</property>
-                           </packing>
-                         </child>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkFrame" id="frame6">
-                         <property name="visible">True</property>
-                         <property name="label_xalign">0</property>
-                         <property name="label_yalign">0.5</property>
-                         <property 
name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-                         <child>
-                           <widget class="GtkHBox" id="hbox25">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">0</property>
-
-                             <child>
-                               <widget class="GtkLabel" id="label36">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Max. CPU usage (%):</property>
-                                 <property 
name="use_underline">False</property>
-                                 <property name="use_markup">False</property>
-                                 <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap">False</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0.5</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">5</property>
-                                 <property name="ypad">0</property>
-                                 <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property 
name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-
-                             <child>
-                               <widget class="GtkEntry" id="entCPU">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="editable">True</property>
-                                 <property name="visibility">True</property>
-                                 <property name="max_length">0</property>
-                                 <property name="text" 
translatable="yes"></property>
-                                 <property name="has_frame">True</property>
-                                 <property name="invisible_char">*</property>
-                                 <property 
name="activates_default">False</property>
-                                 <signal name="changed" 
handler="on_entCPU_changed" object="entCPU" last_modification_time="Sat, 16 Apr 
2005 16:39:09 GMT"/>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">True</property>
-                                 <property name="fill">True</property>
-                               </packing>
-                             </child>
-                           </widget>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="label35">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">CPU 
usage</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
-                           </widget>
-                           <packing>
-                             <property name="type">label_item</property>
-                           </packing>
-                         </child>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="label27">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Load 
limitation</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="type">label_item</property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHButtonBox" id="hbuttonbox4">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-         <property name="spacing">0</property>
-
-         <child>
-           <widget class="GtkButton" id="step3_back">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="load_step2" object="assi_step3" 
last_modification_time="Sun, 14 May 2006 08:02:29 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment34">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox57">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image67">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-go-back</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label88">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Back</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="step3_next">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="load_step4" object="assi_step3" 
last_modification_time="Sun, 14 May 2006 08:02:43 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment35">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox58">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image68">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-go-forward</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label89">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Next</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="step3_abort">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_abort_clicked" 
object="assi_step3" last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment36">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox59">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image69">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-cancel</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label90">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Cancel</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="assi_step5">
-  <property name="width_request">450</property>
-  <property name="height_request">350</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="on_assi_destroy" 
last_modification_time="Fri, 15 Apr 2005 14:27:29 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox12">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkFrame" id="frame7">
-         <property name="visible">True</property>
-         <property name="label_xalign">0</property>
-         <property name="label_yalign">0.5</property>
-         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-         <child>
-           <widget class="GtkVBox" id="vbox13">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow7">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTextView" id="textview10">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">False</property>
-                     <property name="overwrite">False</property>
-                     <property name="accepts_tab">True</property>
-                     <property name="justification">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap_mode">GTK_WRAP_WORD</property>
-                     <property name="cursor_visible">False</property>
-                     <property name="pixels_above_lines">0</property>
-                     <property name="pixels_below_lines">0</property>
-                     <property name="pixels_inside_wrap">0</property>
-                     <property name="left_margin">2</property>
-                     <property name="right_margin">0</property>
-                     <property name="indent">0</property>
-                     <property name="text" translatable="yes">GNUnet is able 
to store data from other peers in your datastore. This is useful if an 
adversary has access to your inserted content and you need to deny that the 
content is yours. With &quot;content migration&quot; on, the content could have 
&quot;migrated&quot; over the internet to your node without your knowledge.
+The "Max. CPU usage" is the percentage of processor time GNUnet is allowed to 
use.</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHSeparator" id="hseparator4">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox9">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox10">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkFrame" id="frame4">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox24">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkTable" id="table2">
+                                    <property name="visible">True</property>
+                                    <property name="n_rows">2</property>
+                                    <property name="n_columns">2</property>
+                                    <property 
name="column_spacing">5</property>
+                                    <property name="row_spacing">5</property>
+                                    <child>
+                                      <widget class="GtkEntry" id="entDown">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="invisible_char">*</property>
+                                        <signal name="changed" 
handler="on_entDown_changed" object="entDown"/>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="right_attach">2</property>
+                                        <property 
name="top_attach">1</property>
+                                        <property 
name="bottom_attach">2</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label33">
+                                        <property 
name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xpad">5</property>
+                                        <property name="label" 
translatable="yes">Downstream (Bytes/s):</property>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="top_attach">1</property>
+                                        <property 
name="bottom_attach">2</property>
+                                        <property 
name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="entUp">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="invisible_char">*</property>
+                                        <signal name="changed" 
handler="on_entUp_changed" object="entUp"/>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="left_attach">1</property>
+                                        <property 
name="right_attach">2</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label32">
+                                        <property 
name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="xpad">5</property>
+                                        <property name="label" 
translatable="yes">Upstream (Bytes/s):</property>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label31">
+                                <property name="visible">True</property>
+                                <property name="label" 
translatable="yes">Bandwidth limitation</property>
+                              </widget>
+                              <packing>
+                                <property name="type">label_item</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkFrame" id="frame5">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox11">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkRadioButton" 
id="radGNUnet">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" 
translatable="yes">Use denoted bandwidth for GNUnet</property>
+                                    <property 
name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                    <property name="group">radShare</property>
+                                    <signal name="toggled" 
handler="on_radGNUnet_toggled" object="radGNUnet"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="radShare">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" 
translatable="yes">Share denoted bandwidth with other applications</property>
+                                    <property 
name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                    <property name="group">radGNUnet</property>
+                                    <signal name="toggled" 
handler="on_radShare_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label34">
+                                <property name="visible">True</property>
+                                <property name="label" 
translatable="yes">Bandwidth sharing</property>
+                              </widget>
+                              <packing>
+                                <property name="type">label_item</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkFrame" id="frame6">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox25">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label36">
+                                    <property name="visible">True</property>
+                                    <property name="xpad">5</property>
+                                    <property name="label" 
translatable="yes">Max. CPU usage (%):</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="entCPU">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">*</property>
+                                    <signal name="changed" 
handler="on_entCPU_changed" object="entCPU"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label35">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">CPU 
usage</property>
+                              </widget>
+                              <packing>
+                                <property name="type">label_item</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label27">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Load 
limitation</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox4">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="step3_back">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="load_step2" 
object="assi_step3"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment34">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox57">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image67">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-go-back</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label88">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Back</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="step3_next">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="load_step4" 
object="assi_step3"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment35">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox58">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image68">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-go-forward</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label89">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Next</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="step3_abort">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_abort_clicked" 
object="assi_step3"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment36">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox59">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image69">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cancel</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label90">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Cancel</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="assi_step5">
+    <property name="width_request">450</property>
+    <property name="height_request">350</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <signal name="destroy" handler="on_assi_destroy"/>
+    <child>
+      <widget class="GtkVBox" id="vbox12">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkFrame" id="frame7">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <child>
+              <widget class="GtkVBox" id="vbox13">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property 
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <child>
+                      <widget class="GtkTextView" id="textview10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">False</property>
+                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                        <property name="left_margin">2</property>
+                        <property name="cursor_visible">False</property>
+                        <property name="text" translatable="yes">GNUnet is 
able to store data from other peers in your datastore. This is useful if an 
adversary has access to your inserted content and you need to deny that the 
content is yours. With "content migration" on, the content could have 
"migrated" over the internet to your node without your knowledge.
 It also helps to spread popular content over different peers to enhance 
availability.
 
 The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content). Its maximum size can be specified below.
@@ -1500,1061 +877,662 @@
 If you are an experienced user, you may want to tweak your GNUnet installation 
using the enhanced configurator.
 
 After changing the configuration and/or updating GNUnet, it is sometimes 
required to run gnunet-update to update internal data structures. Depending on 
the changes made, this may take some time.</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHSeparator" id="hseparator5">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox14">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox15">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="chkMigr">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">4</property>
+                            <property name="label" translatable="yes">Store 
migrated content</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" 
handler="on_chkMigr_toggled" object="chkMigr"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox53">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label84">
+                                <property name="visible">True</property>
+                                <property name="xpad">8</property>
+                                <property name="label" 
translatable="yes">Maximum datastore size (MB):</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="entQuota">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">*</property>
+                                <signal name="changed" 
handler="on_entQuota_changed" object="entQuota"/>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="chkStart">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">5</property>
+                            <property name="label" translatable="yes">Start 
the GNUnet background process on computer startup</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" 
handler="on_chkStart_toggled" object="chkStart"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="chkEnh">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">5</property>
+                            <property name="label" translatable="yes">Open the 
enhanced configurator</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_chkEnh_toggled" 
object="chkEnh"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="chkUpdate">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">5</property>
+                            <property name="label" translatable="yes">Run 
gnunet-update</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" 
handler="on_chkUpdate_toggled" object="chkUpdate"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label43">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Other 
settings</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox5">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="step5_back">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="load_step4" 
object="assi_step5"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment37">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox60">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image70">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-go-back</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label91">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Back</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="step5_next">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_finish_clicked" 
object="assi_step5"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment40">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox63">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image73">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-save</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label94">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Finish</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="step5_cancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_abort_clicked" 
object="assi_step5"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment39">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox62">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image72">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cancel</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label93">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Cancel</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="assi_step4">
+    <property name="width_request">450</property>
+    <property name="height_request">350</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <signal name="destroy" handler="on_assi_destroy"/>
+    <child>
+      <widget class="GtkVBox" id="vbox18">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkFrame" id="frame8">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <child>
+              <widget class="GtkVBox" id="vbox19">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property 
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <child>
+                      <widget class="GtkTextView" id="textview12">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">False</property>
+                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                        <property name="left_margin">2</property>
+                        <property name="cursor_visible">False</property>
+                        <property name="text" translatable="yes">Define the 
user and the group owning the GNUnet service here.
 
-             <child>
-               <widget class="GtkHSeparator" id="hseparator5">
-                 <property name="visible">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkVBox" id="vbox14">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
-                 <child>
-                   <widget class="GtkVBox" id="vbox15">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkCheckButton" id="chkMigr">
-                         <property name="border_width">4</property>
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">Store 
migrated content</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <property name="active">False</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkMigr_toggled" 
object="chkMigr" last_modification_time="Sat, 16 Apr 2005 16:45:18 GMT"/>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkHBox" id="hbox53">
-                         <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
-
-                         <child>
-                           <widget class="GtkLabel" id="label84">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Maximum 
datastore size (MB):</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">8</property>
-                             <property name="ypad">0</property>
-                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkEntry" id="entQuota">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="editable">True</property>
-                             <property name="visibility">True</property>
-                             <property name="max_length">0</property>
-                             <property name="text" 
translatable="yes"></property>
-                             <property name="has_frame">True</property>
-                             <property name="invisible_char">*</property>
-                             <property 
name="activates_default">False</property>
-                             <signal name="changed" 
handler="on_entQuota_changed" object="entQuota" last_modification_time="Sat, 16 
Apr 2005 16:45:24 GMT"/>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
-                           </packing>
-                         </child>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkCheckButton" id="chkStart">
-                         <property name="border_width">5</property>
-                         <property name="visible">True</property>
-                         <property name="sensitive">False</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">Start the 
GNUnet background process on computer startup</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <property name="active">False</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkStart_toggled" 
object="chkStart" last_modification_time="Sat, 16 Apr 2005 16:45:28 GMT"/>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkCheckButton" id="chkEnh">
-                         <property name="border_width">5</property>
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">Open the 
enhanced configurator</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <property name="active">False</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkEnh_toggled" 
object="chkEnh" last_modification_time="Sat, 16 Apr 2005 16:45:33 GMT"/>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkCheckButton" id="chkUpdate">
-                         <property name="border_width">5</property>
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">Run 
gnunet-update</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <property name="active">True</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkUpdate_toggled" 
object="chkUpdate" last_modification_time="Fri, 23 Dec 2005 23:21:01 GMT"/>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="label43">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Other 
settings</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="type">label_item</property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHButtonBox" id="hbuttonbox5">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-         <property name="spacing">0</property>
-
-         <child>
-           <widget class="GtkButton" id="step5_back">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="load_step4" object="assi_step5" 
last_modification_time="Sun, 14 May 2006 08:07:44 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment37">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox60">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image70">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-go-back</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label91">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Back</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="step5_next">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_finish_clicked" 
object="assi_step5" last_modification_time="Thu, 14 Apr 2005 17:47:51 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment40">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox63">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image73">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-save</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label94">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Finish</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="step5_cancel">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_abort_clicked" 
object="assi_step5" last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment39">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox62">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image72">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-cancel</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label93">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Cancel</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="assi_step4">
-  <property name="width_request">450</property>
-  <property name="height_request">350</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">GNUnet configuration 
assistant</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="on_assi_destroy" 
last_modification_time="Fri, 15 Apr 2005 14:27:29 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox18">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkFrame" id="frame8">
-         <property name="visible">True</property>
-         <property name="label_xalign">0</property>
-         <property name="label_yalign">0.5</property>
-         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-         <child>
-           <widget class="GtkVBox" id="vbox19">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow8">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTextView" id="textview12">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">False</property>
-                     <property name="overwrite">False</property>
-                     <property name="accepts_tab">True</property>
-                     <property name="justification">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap_mode">GTK_WRAP_WORD</property>
-                     <property name="cursor_visible">False</property>
-                     <property name="pixels_above_lines">0</property>
-                     <property name="pixels_below_lines">0</property>
-                     <property name="pixels_inside_wrap">0</property>
-                     <property name="left_margin">2</property>
-                     <property name="right_margin">0</property>
-                     <property name="indent">0</property>
-                     <property name="text" translatable="yes">Define the user 
and the group owning the GNUnet service here.
-
 For security reasons, it is a good idea to let this setup create a new user 
account and a new group under which the GNUnet service is started at system 
startup.
 
 However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.
 
 Leave the fields empty to run GNUnet with system privileges.</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkHSeparator" id="hseparator7">
-                 <property name="visible">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkTable" id="table3">
-                 <property name="border_width">5</property>
-                 <property name="visible">True</property>
-                 <property name="n_rows">2</property>
-                 <property name="n_columns">2</property>
-                 <property name="homogeneous">False</property>
-                 <property name="row_spacing">5</property>
-                 <property name="column_spacing">5</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label110">
-                     <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">Group:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">5</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">1</property>
-                     <property name="top_attach">1</property>
-                     <property name="bottom_attach">2</property>
-                     <property name="x_options">fill</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkEntry" id="entUser">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">True</property>
-                     <property name="visibility">True</property>
-                     <property name="max_length">0</property>
-                     <property name="text"></property>
-                     <property name="has_frame">True</property>
-                     <property name="invisible_char">*</property>
-                     <property name="activates_default">False</property>
-                     <signal name="changed" handler="on_entUser_changed" 
object="entUser" last_modification_time="Tue, 21 Jun 2005 18:37:05 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="y_options"></property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkEntry" id="entGroup">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">True</property>
-                     <property name="visibility">True</property>
-                     <property name="max_length">0</property>
-                     <property name="text"></property>
-                     <property name="has_frame">True</property>
-                     <property name="invisible_char">*</property>
-                     <property name="activates_default">False</property>
-                     <signal name="changed" handler="on_entGroup_changed" 
object="entGroup" last_modification_time="Tue, 21 Jun 2005 18:37:14 GMT"/>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">1</property>
-                     <property name="right_attach">2</property>
-                     <property name="top_attach">1</property>
-                     <property name="bottom_attach">2</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkLabel" id="label109">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">User 
account:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">5</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">1</property>
-                     <property name="top_attach">0</property>
-                     <property name="bottom_attach">1</property>
-                     <property name="x_options">fill</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="label101">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Other 
settings</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="type">label_item</property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHButtonBox" id="hbuttonbox8">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-         <property name="spacing">0</property>
-
-         <child>
-           <widget class="GtkButton" id="step4_back">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="load_step3" object="assi_step4" 
last_modification_time="Sun, 14 May 2006 08:04:09 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment43">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox70">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image79">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-go-back</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label102">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Back</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="step4_next">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="load_step5" object="assi_step4" 
last_modification_time="Sun, 14 May 2006 08:04:24 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment48">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox78">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image84">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-go-forward</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label111">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Next</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="step4_abort">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_abort_clicked" 
object="assi_step4" last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment45">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox72">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image81">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-cancel</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label104">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Cancel</property>
-                         <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="setupWindow">
-  <property name="visible">True</property>
-  <property name="can_focus">True</property>
-  <property name="has_focus">True</property>
-  <property name="title" translatable="yes">gnunet-setup</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="default_width">640</property>
-  <property name="default_height">480</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon_name">gtk-properties</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 
08 Sep 2006 06:14:25 GMT"/>
-  <signal name="delete_event" handler="on_main_window_delete_event" 
last_modification_time="Fri, 08 Sep 2006 06:14:38 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkHButtonBox" id="topHButtonBox">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
-         <property name="spacing">0</property>
-
-         <child>
-           <widget class="GtkButton" id="saveButton">
-             <property name="visible">True</property>
-             <property name="tooltip" translatable="yes">Save 
configuration</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-save</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_saveButton_activate" 
last_modification_time="Mon, 11 Sep 2006 00:15:51 GMT"/>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="aboutButton">
-             <property name="visible">True</property>
-             <property name="tooltip" translatable="yes">Show copyright 
information for gnunet-setup.</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-about</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_aboutButton_activate" 
last_modification_time="Mon, 11 Sep 2006 00:16:02 GMT"/>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">1</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkScrolledWindow" id="scrolledwindow9">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-         <property name="shadow_type">GTK_SHADOW_IN</property>
-         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-         <child>
-           <widget class="GtkTreeView" id="configTreeView">
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="has_focus">True</property>
-             <property name="headers_visible">True</property>
-             <property name="rules_hint">True</property>
-             <property name="reorderable">True</property>
-             <property name="enable_search">True</property>
-             <property name="fixed_height_mode">False</property>
-             <property name="hover_selection">False</property>
-             <property name="hover_expand">False</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkAboutDialog" id="aboutdialog">
-  <property name="visible">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="name" translatable="yes">gnunet-setup</property>
-  <property name="copyright" translatable="yes">(C) 2001-2006 Christian 
Grothoff (and other contributing authors)</property>
-  <property name="comments" translatable="yes">This is the configuration tool 
for GNUnet.</property>
-  <property name="license" translatable="yes">             GNU GENERAL PUBLIC 
LICENSE
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHSeparator" id="hseparator7">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkTable" id="table3">
+                    <property name="visible">True</property>
+                    <property name="border_width">5</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">5</property>
+                    <property name="row_spacing">5</property>
+                    <child>
+                      <widget class="GtkLabel" id="label109">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="xpad">5</property>
+                        <property name="label" translatable="yes">User 
account:</property>
+                      </widget>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="entGroup">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">*</property>
+                        <signal name="changed" handler="on_entGroup_changed" 
object="entGroup"/>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="entUser">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">*</property>
+                        <signal name="changed" handler="on_entUser_changed" 
object="entUser"/>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label110">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="xpad">5</property>
+                        <property name="label" 
translatable="yes">Group:</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label101">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Other 
settings</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox8">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="step4_back">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="load_step3" 
object="assi_step4"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment43">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox70">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image79">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-go-back</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label102">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Back</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="step4_next">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="load_step5" 
object="assi_step4"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment48">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox78">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image84">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-go-forward</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label111">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Next</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="step4_abort">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_abort_clicked" 
object="assi_step4"/>
+                <child>
+                  <widget class="GtkAlignment" id="alignment45">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox72">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image81">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cancel</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label104">
+                            <property name="visible">True</property>
+                            <property name="label" 
translatable="yes">Cancel</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="setupWindow">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="has_focus">True</property>
+    <property name="title" translatable="yes">gnunet-setup</property>
+    <property name="modal">True</property>
+    <property name="default_width">640</property>
+    <property name="default_height">480</property>
+    <property name="icon_name">gtk-properties</property>
+    <signal name="destroy" handler="gtk_main_quit"/>
+    <signal name="delete_event" handler="on_main_window_delete_event"/>
+    <child>
+      <widget class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkHButtonBox" id="topHButtonBox">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <child>
+              <widget class="GtkButton" id="saveButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="tooltip" translatable="yes">Save 
configuration</property>
+                <property name="label">gtk-save</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_saveButton_activate"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="aboutButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="tooltip" translatable="yes">Show copyright 
information for gnunet-setup.</property>
+                <property name="label">gtk-about</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_aboutButton_activate"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkNotebook" id="configNotebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+            <property name="show_tabs">False</property>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkAboutDialog" id="aboutdialog">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">About gnunet-setup</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="name">gnunet-setup</property>
+    <property name="copyright" translatable="yes">(C) 2001-2007 Christian 
Grothoff (and other contributing authors)</property>
+    <property name="comments" translatable="yes">This is the configuration 
tool for GNUnet.</property>
+    <property name="website">http://gnunet.org/</property>
+    <property name="website_label">http://gnunet.org/</property>
+    <property name="license" translatable="yes">                   GNU GENERAL 
PUBLIC LICENSE
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
@@ -2617,13 +1595,13 @@
 
   0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The &quot;Program&quot;, 
below,
-refers to any such program or work, and a &quot;work based on the Program&quot;
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
 means either the Program or any derivative work under copyright law:
 that is to say, a work containing the Program or a portion of it,
 either verbatim or with modifications and/or translated into another
 language.  (Hereinafter, translation is included without limitation in
-the term &quot;modification&quot;.)  Each licensee is addressed as 
&quot;you&quot;.
+the term "modification".)  Each licensee is addressed as "you".
 
 Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
@@ -2796,8 +1774,8 @@
 address new problems or concerns.
 
 Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and &quot;any
-later version&quot;, you have the option of following the terms and conditions
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
 either of that version or of any later version published by the Free
 Software Foundation.  If the Program does not specify a version number of
 this License, you may choose any version ever published by the Free Software
@@ -2816,7 +1794,7 @@
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER 
EXPRESSED
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
@@ -2844,7 +1822,7 @@
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
-the &quot;copyright&quot; line and a pointer to where the full notice is found.
+the "copyright" line and a pointer to where the full notice is found.
 
     &lt;one line to give the program's name and a brief idea of what it 
does.&gt;
     Copyright (C) &lt;year&gt;  &lt;name of author&gt;
@@ -2880,7 +1858,7 @@
 mouse-clicks or menu items--whatever suits your program.
 
 You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a &quot;copyright disclaimer&quot; for the program, if
+school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
 
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
@@ -2895,10 +1873,7 @@
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 </property>
-  <property name="wrap_license">True</property>
-  <property name="website">http://gnunet.org/</property>
-  <property name="website_label">http://gnunet.org/</property>
-  <property name="authors">Christian Grothoff &lt;address@hidden&gt;
+    <property name="authors">Christian Grothoff &lt;address@hidden&gt;
 Nils Durner &lt;address@hidden&gt;
 Andrew McDonald &lt;address@hidden&gt;
 Antti Salonen
@@ -2936,14 +1911,27 @@
 Vasil Dimov &lt;address@hidden&gt;
 Werner Koch &lt;address@hidden&gt;
 </property>
-  <property name="documenters">Christian Grothoff &lt;address@hidden&gt;
+    <property name="documenters">Christian Grothoff &lt;address@hidden&gt;
 Nils Durner &lt;address@hidden&gt;
 </property>
-  <property name="artists">Christian Muellner &lt;address@hidden&gt;
+    <property name="translator_credits" translatable="yes" 
comments="TRANSLATORS: Replace this string with your names, one name per 
line.">Not for English ;-)</property>
+    <property name="artists">Christian Muellner &lt;address@hidden&gt;
 Alex Jones &lt;address@hidden&gt;
 Nicklas Larsson &lt;address@hidden&gt;</property>
-  <property name="translator_credits" translatable="yes" 
comments="TRANSLATORS: Replace this string with your names, one name per 
line.">Not for English ;-)</property>
-  <property name="logo">gnunet-logo-color.png</property>
-</widget>
-
+    <property name="logo">gnunet-logo-color.png</property>
+    <property name="wrap_license">True</property>
+    <signal name="close" handler="gtk_widget_destroy_" object="aboutdialog"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>

Modified: GNUnet/src/setup/gtk/ngconf.c
===================================================================
--- GNUnet/src/setup/gtk/ngconf.c       2007-08-25 23:55:05 UTC (rev 5547)
+++ GNUnet/src/setup/gtk/ngconf.c       2007-08-26 05:43:16 UTC (rev 5548)
@@ -24,9 +24,8 @@
  * @author Christian Grothoff
  *
  * TODO:
- * * add proper widgets for each option
- * * implement event handlers to process widget option changes!
- * * update glade file to create Notebook instead of tree view
+ * + handle MC option parsing
+ * + test event handlers for widget option changes!
  */
 
 #include "gnunet_setup_lib.h"
@@ -42,16 +41,66 @@
 
 static const char *cfg_filename;
 
+struct P2W {
+  struct P2W * next;
+  struct GNS_Tree * pos;
+  GtkWidget * w;
+};
+
+/**
+ * Maping of GNS_tree positions to widgets
+ * (used for visibility updates).
+ */
+static struct P2W * pws;
+
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+#else
+static GtkTooltips * tips;
+#endif
+
+static void tooltip(GtkWidget * w,
+                   const char * text) {
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+  gtk_widget_set_tooltip_text(w, text);
+#else
+  gtk_tooltips_set_tip(tips, w, text, NULL);
+#endif
+}
+
+static void update_visibility() {
+  struct P2W * pos;
+
+  pos = pws;
+  while (pos != NULL) {
+    if (pos->pos->visible)
+      gtk_widget_show(pos->w);
+    else
+      gtk_widget_hide(pos->w);
+    pos = pos->next;
+  }
+}
+
+static void link_visibility(struct GNS_Tree * pos,
+                           GtkWidget * w) {
+  struct P2W * pw;
+  pw = MALLOC(sizeof(struct P2W));
+  pw->pos = pos;
+  pw->w = w;
+  pw->next = pws;
+  pws = pw;
+}
+
 static void
 boolean_toggled (GtkToggleButton * togglebutton, gpointer user_data)
 {
   struct GNS_Tree *pos = user_data;
-  GC_set_configuration_value_number (cfg,
+  GC_set_configuration_value_string (cfg,
                                      ectx,
                                      pos->section,
                                      pos->option,
-                                     gtk_toggle_button_get_mode
-                                     (togglebutton));
+                                     gtk_toggle_button_get_active
+                                     (togglebutton) ? "YES" : "NO");
+  update_visibility();
 }
 
 static void
@@ -75,34 +124,55 @@
       list = list->next;
       i++;
     }
+  update_visibility();
 }
 
 static void
-multi_update (GtkRadioButton * button, gpointer user_data)
+multi_update (GtkToggleButton * button,
+             gpointer user_data)
 {
   struct GNS_Tree *pos = user_data;
-  GSList *list = gtk_radio_button_get_group (button);
-  int i;
-  char *val;
-  int size;
+  char * val;
+  char * opt;
+  char * ret;
+  char * v;
+  char * s;
 
-  size = 1;
-  i = 0;
-  while (pos->value.String.legalRange[i] != NULL)
-    size += strlen (pos->value.String.legalRange[i++]) + 1;
-  val = MALLOC (size);
-  val[0] = '\0';
-  i = 0;
-  while (pos->value.String.legalRange[i] != NULL)
-    {
-      if (gtk_toggle_button_get_mode (GTK_TOGGLE_BUTTON (list->data)))
-        strcat (val, pos->value.String.legalRange[i]);
-      list = list->next;
-      i++;
-    }
+  val = NULL;
+  GC_get_configuration_value_string (cfg,
+                                    pos->section, 
+                                    pos->option, 
+                                    NULL,
+                                    &val);
+  GE_ASSERT(ectx, val != NULL);
+  opt = g_object_get_data(G_OBJECT(button),
+                         "MC-value");
+  if (gtk_toggle_button_get_active (button)) {
+    ret = MALLOC(strlen(val) + strlen(opt) + 2);
+    strcpy(ret, val);
+    strcat(ret, " ");
+    strcat(ret, opt);    
+  } else {
+    v = val;
+    while ( (NULL != (s = strstr(v, opt))) &&
+           ( ( (s[strlen(opt)] != '\0') &&
+               (s[strlen(opt)] != ' ') ) ||
+             ( (s != val) &&
+               (s[-1] != ' ') ) ) )
+      v = s + 1;
+    GE_ASSERT(NULL, s != NULL);
+    ret = MALLOC(strlen(val));
+    s[0] = '\0';
+    if (s != val)
+      s[-1] = '\0'; /* kill space */
+    strcpy(ret, val);
+    strcat(ret, &s[strlen(opt)]);
+  }
   GC_set_configuration_value_string (cfg,
-                                     ectx, pos->section, pos->option, val);
+                                     ectx, pos->section, pos->option, ret);
+  FREE (ret);
   FREE (val);
+  update_visibility();
 }
 
 static void
@@ -113,45 +183,55 @@
                                      ectx,
                                      pos->section,
                                      pos->option, gtk_entry_get_text (entry));
+  update_visibility();
 }
 
 static int
 addLeafToTree (GtkWidget * parent, struct GNS_Tree *pos)
 {
-  GtkWidget *box;
-  GtkWidget *label;
+  GtkWidget * ebox;
+  GtkWidget * box;
   GtkWidget *w;
-  GSList *list;
+  GtkWidget * choice;
+  GtkWidget * label;
   int i;
   char defStr[128];
 
-  if (!pos->visible)
-    return 0;
   box = gtk_hbox_new (FALSE, 0);
+  link_visibility(pos, box);
   switch (pos->type & GNS_TypeMask)
     {
     case GNS_Boolean:
       w = gtk_check_button_new_with_label (pos->description);
-      gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (w),
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
                                   pos->value.Boolean.val);
-      g_signal_connect (w, "toggled", &boolean_toggled, pos);
-      gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, FALSE);
+      g_signal_connect (w, "toggled", G_CALLBACK(&boolean_toggled), pos);
+      gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 10);
       break;
     case GNS_String:
+      ebox = gtk_vbox_new (FALSE, 10);
       w = gtk_entry_new ();
+      label = gtk_label_new(pos->description);
+      gtk_label_set_mnemonic_widget(GTK_LABEL(label),
+                                   w);
+      gtk_box_pack_start (GTK_BOX (ebox), label, FALSE, FALSE, 10);
       gtk_entry_set_text (GTK_ENTRY (w), pos->value.String.val);
-      g_signal_connect (w, "toggled", &boolean_toggled, pos);
-      gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, FALSE);
-      label = gtk_label_new (pos->help);
-      gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, FALSE);
+      g_signal_connect (w, "changed", G_CALLBACK(&boolean_toggled), pos);
+      tooltip(w, pos->help);
+      gtk_box_pack_start (GTK_BOX (ebox), w, TRUE, TRUE, 10);
+      gtk_box_pack_start (GTK_BOX (box), ebox, TRUE, TRUE, 10);
       break;
     case GNS_MC:
       i = 0;
+      label = gtk_label_new(pos->description);
+      gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10);
       while (pos->value.String.legalRange[i] != NULL)
         {
           w =
             gtk_check_button_new_with_label (pos->value.String.legalRange[i]);
-          g_signal_connect (w, "toggled", &multi_toggled, pos);
+         g_object_set_data(G_OBJECT(w),
+                           "MC-value",
+                           pos->value.String.legalRange[i]);
           if ((NULL != strstr (pos->value.String.legalRange[i],
                                pos->value.String.val)) &&
               ((' ' == strstr (pos->value.String.legalRange[i],
@@ -169,48 +249,71 @@
                || (' ' ==
                    strstr (pos->value.String.legalRange[i],
                            pos->value.String.val)[-1])))
-            gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (w, TRUE));
-          gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, FALSE);
+            gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
+          g_signal_connect (w, "toggled", G_CALLBACK(&multi_update), pos);
+          gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 5);
           i++;
         }
       break;
     case GNS_SC:
       w = NULL;
       i = 0;
+      choice = NULL;
+      label = gtk_label_new(pos->description);
+      gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10);
       while (pos->value.String.legalRange[i] != NULL)
         {
-          w =
-            gtk_radio_button_new_with_label_from_widget
-            (w, pos->value.String.legalRange[i]);
-          g_signal_connect (w, "toggled", &multi_toggled, pos);
-          gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, FALSE);
+         if (w != NULL)
+           w =
+             gtk_radio_button_new_with_label_from_widget             
+            (GTK_RADIO_BUTTON(w), pos->value.String.legalRange[i]);
+         else
+           w =
+             gtk_radio_button_new_with_label         
+             (NULL, pos->value.String.legalRange[i]);
+          gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
           if (0 ==
               strcmp (pos->value.String.legalRange[i], pos->value.String.val))
-            gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (w, TRUE));
+           choice = w;
+          g_signal_connect (w, "toggled", G_CALLBACK(&radio_update), pos);
           i++;
-        }
+       }        
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (choice), TRUE);
 
       break;
     case GNS_Double:
       SNPRINTF (defStr, 128, "%llf", pos->value.Double.val);
       w = gtk_entry_new ();
-      g_signal_connect (w, "changed", &string_toggled, pos);
+      label = gtk_label_new(pos->description);
+      gtk_label_set_mnemonic_widget(GTK_LABEL(label),
+                                   w);
+      gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10);
+      g_signal_connect (w, "changed", G_CALLBACK(&string_update), pos);
       gtk_entry_set_text (GTK_ENTRY (w), defStr);
-      gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
       break;
     case GNS_UInt64:
-      SNPRINTF (defStr, 128, "%llu", pos->value.UInt64.val);
-      w = gtk_entry_new ();
-      gtk_entry_set_text (GTK_ENTRY (w), defStr);
-      g_signal_connect (w, "changed", &string_toggled, pos);
-      gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, FALSE);
+      w = gtk_spin_button_new_with_range (pos->value.UInt64.min,
+                                         pos->value.UInt64.max,
+                                         1);
+      label = gtk_label_new(pos->description);
+      gtk_label_set_mnemonic_widget(GTK_LABEL(label),
+                                   w);
+      gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (w), 
+                                pos->value.UInt64.val);
+      gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (w), 
+                                  TRUE);
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (w), 
+                                 0);
+      g_signal_connect (w, "changed", G_CALLBACK(&string_update), pos);
+      gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
       break;
     default:
       GE_ASSERT (NULL, 0);
       return 0;
     }
-  label = gtk_label_new (pos->help);
-  gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, FALSE);
+  gtk_box_pack_start (GTK_BOX (parent), box, FALSE, FALSE, 10);
   return 1;
 }
 
@@ -222,20 +325,22 @@
   GtkNotebook *notebook;
   GtkWidget *vbox;
   GtkWidget *label;
+  GtkWidget * scroll;
   int have;
-  if (!pos->visible)
-    return 0;
+
   have = 0;
-  notebook = GTK_NOTEBOOK (gtk_notebook_new ());
+  i = 0;
   vbox = gtk_vbox_new (FALSE, 0);
-  label = gtk_label_new (pos->description);
-  gtk_box_pack_start (GTK_BOX (vbox) notebook, TRUE, TRUE, FALSE);
-  i = 0;
+  notebook = NULL;
   while (NULL != (child = pos->children[i]))
     {
       switch (child->type & GNS_KindMask)
         {
         case GNS_Node:
+         if (notebook == NULL) {
+           notebook = GTK_NOTEBOOK (gtk_notebook_new ());
+           gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET(notebook), TRUE, 
TRUE, 0);
+         }
           have = have | addNodeToTree (notebook, child);
           break;
         case GNS_Leaf:
@@ -250,12 +355,22 @@
     }
   if (have != 0)
     {
-      gtk_notebook_append_page (parent, vbox, label);
+      label = gtk_label_new (pos->description);
+      gtk_widget_show_all(vbox);
+      gtk_widget_show_all(label);
+      scroll = gtk_scrolled_window_new(NULL, NULL);
+      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+                                    GTK_POLICY_NEVER,
+                                    GTK_POLICY_AUTOMATIC);
+      link_visibility(pos, scroll);
+      link_visibility(pos, label);
+      gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll),
+                                           vbox);
+      gtk_notebook_append_page (parent, scroll, label);
     }
   else
     {
-      g_unref (vbox);
-      g_unref (label);
+      g_object_unref (vbox);
     }
   return have;
 }
@@ -263,9 +378,11 @@
 static void
 initView (struct GNS_Context *gns)
 {
-  GtkWidget *notebook;
-  notebook = lookup_widget ("configNotebook");
-  addNodeToTree (notebook, gns);
+  GtkNotebook *notebook;
+  notebook = GTK_NOTEBOOK(lookup_widget ("configNotebook"));
+  addNodeToTree (notebook, GNS_get_tree(gns));
+  gtk_widget_show_all(GTK_WIDGET(notebook));
+  update_visibility();
 }
 
 
@@ -374,6 +491,10 @@
   cfg_filename = filename;
   no_model = gtk_list_store_new (1, G_TYPE_STRING);
   setLibrary (self);
+#if GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 12
+#else
+  tips = gtk_tooltips_new();
+#endif
   mainWindow = get_xml ("setupWindow");
   initView (gns);
   gtk_window_maximize (GTK_WINDOW (mainWindow));





reply via email to

[Prev in Thread] Current Thread [Next in Thread]