gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r2804 - in GNUnet: . m4 src/conf


From: grothoff
Subject: [GNUnet-SVN] r2804 - in GNUnet: . m4 src/conf
Date: Sun, 14 May 2006 01:39:22 -0700 (PDT)

Author: grothoff
Date: 2006-05-14 01:39:13 -0700 (Sun, 14 May 2006)
New Revision: 2804

Added:
   GNUnet/src/conf/wizard_gtk.c
   GNUnet/src/conf/wizard_gtk.h
Removed:
   GNUnet/src/conf/wizard.c
   GNUnet/src/conf/wizard.h
   GNUnet/src/conf/wizard_callbacks.c
   GNUnet/src/conf/wizard_callbacks.h
   GNUnet/src/conf/wizard_interface.c
   GNUnet/src/conf/wizard_interface.h
   GNUnet/src/conf/wizard_support.h
Modified:
   GNUnet/configure.ac
   GNUnet/m4/Makefile.in
   GNUnet/src/conf/Makefile.am
   GNUnet/src/conf/gconf.c
   GNUnet/src/conf/gconf.glade
   GNUnet/src/conf/gconf.gladep
   GNUnet/src/conf/gnunet-setup.c
   GNUnet/src/conf/wizard.glade
   GNUnet/src/conf/wizard.gladep
   GNUnet/todo
Log:
breaking gnunet-setup big time

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/configure.ac 2006-05-14 08:39:13 UTC (rev 2804)
@@ -353,6 +353,9 @@
 if test $without_gtk != true
 then
  AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK])
+ PKG_CHECK_MODULES(GNUNETGTK, libglade-2.0) # libgnomeui-2.0 >= 1.110.0
+ AC_SUBST(GNUNETGTK_CFLAGS)
+ AC_SUBST(GNUNETGTK_LIBS)
 fi
 
 # check for gettext

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/m4/Makefile.in       2006-05-14 08:39:13 UTC (rev 2804)
@@ -42,9 +42,9 @@
        $(top_srcdir)/m4/guile.m4 $(top_srcdir)/m4/iconv.m4 \
        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libgcrypt.m4 \
-       $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-       $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -92,6 +92,8 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
+GNUNETGTK_CFLAGS = @GNUNETGTK_CFLAGS@
+GNUNETGTK_LIBS = @GNUNETGTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GUILE = @GUILE@

Modified: GNUnet/src/conf/Makefile.am
===================================================================
--- GNUnet/src/conf/Makefile.am 2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/Makefile.am 2006-05-14 08:39:13 UTC (rev 2804)
@@ -35,12 +35,20 @@
  lkc_defs.h
 
 EXTRA_DIST = \
+ wizard.glade \
+ gconf.glade \
  images.c \
  lex.zconf.c \
  lkc_proto.h \
  bool.h \
  wizard_gtk.h
 
+install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+       $(INSTALL_DATA) gconf.glade $(DESTDIR)$(pkgdatadir)
+       $(INSTALL_DATA) wizard.glade $(DESTDIR)$(pkgdatadir)
+       @$(NORMAL_INSTALL)
+
 if HAVE_CURSES
 if HAVE_PDCURSES
  pdcurses_lib = -lpdcurses
@@ -65,7 +73,7 @@
  zconf_tab.c zconf_tab.h \
  wizard_util.c \
  wizard_util.h
- 
+
 libgnunetsetup_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 
@@ -85,40 +93,41 @@
  mconf_yesno.c \
  wizard_curs.c \
  wizard_curs.h
- 
+
 libgnunetsetup_curses_la_LDFLAGS = \
  $(curses_lib) $(pdcurses_lib) \
  -export-dynamic -avoid-version -module
- 
+
 libgnunetsetup_curses_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetsetup.la
 
 libgnunetsetup_gtk_la_SOURCES = \
- gconf_callbacks.h \
- gconf_interface.h \
  gconf_support.h \
- gconf_interface.c \
  gconf_support.c \
  gconf.c gconf.h \
- wizard_callbacks.h \
- wizard_interface.h \
- wizard_support.h \
- wizard_callbacks.c \
- wizard_interface.c \
- wizard.c wizard.h
+ wizard_gtk.c wizard_gtk.h
 
 libgnunetsetup_gtk_la_LDFLAGS = \
- $(GTK_LIBS) @EXT_LIB_PATH@ @EXT_LIBS@ -lgthread-2.0 \
+ $(GTK_LIBS) @EXT_LIB_PATH@ @EXT_LIBS@ \
  -export-dynamic -avoid-version -module
- 
+
+libgnunetsetup_gtk_la_CFLAGS = \
+ -I$(top_scrdir)/include \
+ @GNUNETGTK_CFLAGS@ \
+ @GTK_CFLAGS@ 
+
 libgnunetsetup_gtk_la_LIBADD = \
+ @GTK_LIBS@ @EXT_LIB_PATH@ @EXT_LIBS@ \
+ @GNUNETGTK_LIBS@ \
+  $(INTLLIBS) \
+  -lgthread-2.0 \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetsetup.la
 
 gnunet_setup_SOURCES = \
  gnunet-setup.c
- 
+
 gnunet_setup_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetsetup.la

Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c     2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/gconf.c     2006-05-14 08:39:13 UTC (rev 2804)
@@ -1725,8 +1725,9 @@
     display_tree(&rootmenu);
     break;
   }
-
+  gdk_threads_enter();
   gtk_main();
+  gdk_threads_leave();
 
   return 0;
 }

Modified: GNUnet/src/conf/gconf.glade
===================================================================
--- GNUnet/src/conf/gconf.glade 2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/gconf.glade 2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,1135 +1,1177 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-
-<widget class="GtkWindow" id="main_wnd">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Gtk GNUnet Configurator</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</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="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>
-  <signal name="destroy" handler="on_window1_destroy" object="main_wnd"/>
-  <signal name="size_request" handler="on_window1_size_request" 
object="vpaned1" last_modification_time="Fri, 11 Jan 2002 16:17:11 GMT"/>
-  <signal name="delete_event" handler="on_window1_delete_event" 
object="main_wnd" last_modification_time="Sun, 09 Mar 2003 19:42:46 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="GtkMenuBar" id="menubar1">
-         <property name="visible">True</property>
-
-         <child>
-           <widget class="GtkMenuItem" id="file1">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_File</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="file1_menu">
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="load1">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Load a config 
file</property>
-                     <property name="label" translatable="yes">_Load</property>
-                     <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_load1_activate"/>
-                     <accelerator key="L" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image27">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-open</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="save1">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Save the 
config in .config</property>
-                     <property name="label" translatable="yes">_Save</property>
-                     <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_save1_activate"/>
-                     <accelerator key="S" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image28">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-save</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="separator1">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="quit1">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Quit</property>
-                     <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_quit1_activate"/>
-                     <accelerator key="Q" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image30">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-quit</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkMenuItem" id="options1">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_Options</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="options1_menu">
-
-                 <child>
-                   <widget class="GtkCheckMenuItem" id="show_name1">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Show 
name</property>
-                     <property name="label" translatable="yes">Show 
_name</property>
-                     <property name="use_underline">True</property>
-                     <property name="active">False</property>
-                     <signal name="activate" handler="on_show_name1_activate"/>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkCheckMenuItem" id="show_range1">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Show range 
(Y/M/N)</property>
-                     <property name="label" translatable="yes">Show 
_range</property>
-                     <property name="use_underline">True</property>
-                     <property name="active">False</property>
-                     <signal name="activate" 
handler="on_show_range1_activate"/>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkCheckMenuItem" id="show_data1">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Show value of 
the option</property>
-                     <property name="label" translatable="yes">Show 
_data</property>
-                     <property name="use_underline">True</property>
-                     <property name="active">False</property>
-                     <signal name="activate" handler="on_show_data1_activate"/>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="separator2">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkCheckMenuItem" id="show_all_options1">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Show all 
options</property>
-                     <property name="label" translatable="yes">Show all 
_options</property>
-                     <property name="use_underline">True</property>
-                     <property name="active">False</property>
-                     <signal name="activate" 
handler="on_show_all_options1_activate"/>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkMenuItem" id="help1">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_Help</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="help1_menu">
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="introduction1">
-                     <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">_Introduction</property>
-                     <property name="use_underline">True</property>
-                     <signal name="activate" 
handler="on_introduction1_activate" last_modification_time="Fri, 15 Nov 2002 
20:26:30 GMT"/>
-                     <accelerator key="I" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image31">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-dialog-question</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="about1">
-                     <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">_About</property>
-                     <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_about1_activate" 
last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
-                     <accelerator key="A" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image32">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-properties</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="license1">
-                     <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">_License</property>
-                     <property name="use_underline">True</property>
-                     <signal name="activate" handler="on_license1_activate" 
last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image33">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-justify-fill</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHandleBox" id="handlebox1">
-         <property name="visible">True</property>
-         <property name="shadow_type">GTK_SHADOW_OUT</property>
-         <property name="handle_position">GTK_POS_LEFT</property>
-         <property name="snap_edge">GTK_POS_TOP</property>
-
-         <child>
-           <widget class="GtkToolbar" id="toolbar1">
-             <property name="visible">True</property>
-             <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-             <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-             <property name="tooltips">True</property>
-             <property name="show_arrow">True</property>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem1">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button1">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Goes up of 
one level (single view)</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="pressed" handler="on_back_pressed"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment11">
-                         <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="hbox11">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image44">
-                                 <property name="visible">True</property>
-                                 <property name="stock">gtk-go-up</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="label11">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Up</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem2">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkVSeparator" id="vseparator1">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem3">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button2">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Load a config 
file</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="pressed" handler="on_load_pressed"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment2">
-                         <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="hbox2">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image35">
-                                 <property name="visible">True</property>
-                                 <property name="stock">gtk-open</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="label2">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Load</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem4">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button3">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Save a config 
file</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="pressed" handler="on_save_pressed"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment4">
-                         <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="hbox4">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image37">
-                                 <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="label4">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Save</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem5">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkVSeparator" id="vseparator2">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem6">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button4">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Single 
view</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="clicked" handler="on_single_clicked" 
last_modification_time="Sun, 12 Jan 2003 14:28:39 GMT"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment6">
-                         <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="hbox6">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image39">
-                                 <property name="visible">True</property>
-                                 <property 
name="stock">gtk-justify-fill</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="label6">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Single</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem7">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button5">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Split 
view</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="clicked" handler="on_split_clicked" 
last_modification_time="Sun, 12 Jan 2003 14:28:45 GMT"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment7">
-                         <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="hbox7">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image40">
-                                 <property name="visible">True</property>
-                                 <property 
name="stock">gtk-justify-fill</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="label7">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Split</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem8">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button6">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Full 
view</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="clicked" handler="on_full_clicked" 
last_modification_time="Sun, 12 Jan 2003 14:28:50 GMT"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment8">
-                         <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="hbox8">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image41">
-                                 <property name="visible">True</property>
-                                 <property 
name="stock">gtk-justify-fill</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="label8">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Full</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem9">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkVSeparator" id="vseparator3">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem10">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button7">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Collapse the 
whole tree in the right frame</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="pressed" handler="on_collapse_pressed"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment9">
-                         <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="hbox9">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image42">
-                                 <property name="visible">True</property>
-                                 <property name="stock">gtk-remove</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="label9">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Collapse</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkToolItem" id="toolitem11">
-                 <property name="visible">True</property>
-                 <property name="visible_horizontal">True</property>
-                 <property name="visible_vertical">True</property>
-                 <property name="is_important">False</property>
-
-                 <child>
-                   <widget class="GtkButton" id="button8">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Expand the 
whole tree in the right frame</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="pressed" handler="on_expand_pressed"/>
-
-                     <child>
-                       <widget class="GtkAlignment" id="alignment10">
-                         <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="hbox10">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
-
-                             <child>
-                               <widget class="GtkImage" id="image43">
-                                 <property name="visible">True</property>
-                                 <property name="stock">gtk-add</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="label10">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Expand</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>
-                               </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="expand">False</property>
-                 <property name="homogeneous">False</property>
-               </packing>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHPaned" id="hpaned1">
-         <property name="width_request">1</property>
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="position">0</property>
-
-         <child>
-           <widget class="GtkScrolledWindow" id="scrolledwindow1">
-             <property name="visible">True</property>
-             <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-             <property name="shadow_type">GTK_SHADOW_IN</property>
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-             <child>
-               <widget class="GtkTreeView" id="treeview1">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="headers_visible">True</property>
-                 <property name="rules_hint">False</property>
-                 <property name="reorderable">False</property>
-                 <property name="enable_search">True</property>
-                 <signal name="cursor_changed" 
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 
15:58:22 GMT"/>
-                 <signal name="button_press_event" 
handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan 
2003 16:03:52 GMT"/>
-                 <signal name="key_press_event" 
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 
16:11:44 GMT"/>
-               </widget>
-             </child>
-           </widget>
-           <packing>
-             <property name="shrink">True</property>
-             <property name="resize">False</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkVPaned" id="vpaned1">
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="position">0</property>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow2">
-                 <property name="visible">True</property>
-                 <property 
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property name="shadow_type">GTK_SHADOW_IN</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTreeView" id="treeview2">
-                     <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">False</property>
-                     <property name="reorderable">False</property>
-                     <property name="enable_search">True</property>
-                     <signal name="cursor_changed" 
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 
15:57:55 GMT"/>
-                     <signal name="button_press_event" 
handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan 
2003 15:57:58 GMT"/>
-                     <signal name="key_press_event" 
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 
15:58:01 GMT"/>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="shrink">True</property>
-                 <property name="resize">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow3">
-                 <property name="visible">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property name="shadow_type">GTK_SHADOW_IN</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTextView" id="textview3">
-                     <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">True</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">0</property>
-                     <property name="right_margin">0</property>
-                     <property name="indent">0</property>
-                     <property name="text" translatable="yes">Sorry, no help 
available for this option yet.</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="shrink">True</property>
-                 <property name="resize">True</property>
-               </packing>
-             </child>
-           </widget>
-           <packing>
-             <property name="shrink">True</property>
-             <property name="resize">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>
-</widget>
-
-</glade-interface>
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
+
+<glade-interface>
+
+<widget class="GtkWindow" id="main_wnd">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Gtk GNUnet Configurator</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</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="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_window1_destroy" object="main_wnd"/>
+  <signal name="size_request" handler="on_window1_size_request" 
object="vpaned1" last_modification_time="Fri, 11 Jan 2002 16:17:11 GMT"/>
+  <signal name="delete_event" handler="on_window1_delete_event" 
object="main_wnd" last_modification_time="Sun, 09 Mar 2003 19:42:46 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="GtkMenuBar" id="menubar1">
+         <property name="visible">True</property>
+         <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+         <property 
name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+
+         <child>
+           <widget class="GtkMenuItem" id="file1">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">_File</property>
+             <property name="use_underline">True</property>
+
+             <child>
+               <widget class="GtkMenu" id="file1_menu">
+
+                 <child>
+                   <widget class="GtkImageMenuItem" id="load1">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Load a config 
file</property>
+                     <property name="label" translatable="yes">_Load</property>
+                     <property name="use_underline">True</property>
+                     <signal name="activate" handler="on_load1_activate"/>
+                     <accelerator key="L" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image27">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-open</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkImageMenuItem" id="save1">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Save the 
config in .config</property>
+                     <property name="label" translatable="yes">_Save</property>
+                     <property name="use_underline">True</property>
+                     <signal name="activate" handler="on_save1_activate"/>
+                     <accelerator key="S" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image28">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-save</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkMenuItem" id="separator1">
+                     <property name="visible">True</property>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkImageMenuItem" id="quit1">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">_Quit</property>
+                     <property name="use_underline">True</property>
+                     <signal name="activate" handler="on_quit1_activate"/>
+                     <accelerator key="Q" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image30">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-quit</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                 </child>
+               </widget>
+             </child>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkMenuItem" id="options1">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">_Options</property>
+             <property name="use_underline">True</property>
+
+             <child>
+               <widget class="GtkMenu" id="options1_menu">
+
+                 <child>
+                   <widget class="GtkCheckMenuItem" id="show_name1">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Show 
name</property>
+                     <property name="label" translatable="yes">Show 
_name</property>
+                     <property name="use_underline">True</property>
+                     <property name="active">False</property>
+                     <signal name="activate" handler="on_show_name1_activate"/>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkCheckMenuItem" id="show_range1">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Show range 
(Y/M/N)</property>
+                     <property name="label" translatable="yes">Show 
_range</property>
+                     <property name="use_underline">True</property>
+                     <property name="active">False</property>
+                     <signal name="activate" 
handler="on_show_range1_activate"/>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkCheckMenuItem" id="show_data1">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Show value of 
the option</property>
+                     <property name="label" translatable="yes">Show 
_data</property>
+                     <property name="use_underline">True</property>
+                     <property name="active">False</property>
+                     <signal name="activate" handler="on_show_data1_activate"/>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkMenuItem" id="separator2">
+                     <property name="visible">True</property>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkCheckMenuItem" id="show_all_options1">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Show all 
options</property>
+                     <property name="label" translatable="yes">Show all 
_options</property>
+                     <property name="use_underline">True</property>
+                     <property name="active">False</property>
+                     <signal name="activate" 
handler="on_show_all_options1_activate"/>
+                   </widget>
+                 </child>
+               </widget>
+             </child>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkMenuItem" id="help1">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">_Help</property>
+             <property name="use_underline">True</property>
+
+             <child>
+               <widget class="GtkMenu" id="help1_menu">
+
+                 <child>
+                   <widget class="GtkImageMenuItem" id="introduction1">
+                     <property name="visible">True</property>
+                     <property name="label" 
translatable="yes">_Introduction</property>
+                     <property name="use_underline">True</property>
+                     <signal name="activate" 
handler="on_introduction1_activate" last_modification_time="Fri, 15 Nov 2002 
20:26:30 GMT"/>
+                     <accelerator key="I" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image31">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-dialog-question</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkImageMenuItem" id="about1">
+                     <property name="visible">True</property>
+                     <property name="label" 
translatable="yes">_About</property>
+                     <property name="use_underline">True</property>
+                     <signal name="activate" handler="on_about1_activate" 
last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
+                     <accelerator key="A" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image32">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-properties</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                 </child>
+
+                 <child>
+                   <widget class="GtkImageMenuItem" id="license1">
+                     <property name="visible">True</property>
+                     <property name="label" 
translatable="yes">_License</property>
+                     <property name="use_underline">True</property>
+                     <signal name="activate" handler="on_license1_activate" 
last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image33">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-justify-fill</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                 </child>
+               </widget>
+             </child>
+           </widget>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">False</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkHandleBox" id="handlebox1">
+         <property name="visible">True</property>
+         <property name="shadow_type">GTK_SHADOW_OUT</property>
+         <property name="handle_position">GTK_POS_LEFT</property>
+         <property name="snap_edge">GTK_POS_TOP</property>
+
+         <child>
+           <widget class="GtkToolbar" id="toolbar1">
+             <property name="visible">True</property>
+             <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+             <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+             <property name="tooltips">True</property>
+             <property name="show_arrow">True</property>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem1">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button1">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Goes up of 
one level (single view)</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="pressed" handler="on_back_pressed"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment11">
+                         <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="hbox11">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image44">
+                                 <property name="visible">True</property>
+                                 <property name="stock">gtk-go-up</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="label11">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Up</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem2">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkVSeparator" id="vseparator1">
+                     <property name="visible">True</property>
+                   </widget>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem3">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button2">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Load a config 
file</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="pressed" handler="on_load_pressed"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment2">
+                         <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="hbox2">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image35">
+                                 <property name="visible">True</property>
+                                 <property name="stock">gtk-open</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="label2">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Load</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem4">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button3">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Save a config 
file</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="pressed" handler="on_save_pressed"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment4">
+                         <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="hbox4">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image37">
+                                 <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="label4">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Save</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem5">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkVSeparator" id="vseparator2">
+                     <property name="visible">True</property>
+                   </widget>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem6">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button4">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Single 
view</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" handler="on_single_clicked" 
last_modification_time="Sun, 12 Jan 2003 14:28:39 GMT"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment6">
+                         <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="hbox6">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image39">
+                                 <property name="visible">True</property>
+                                 <property 
name="stock">gtk-justify-fill</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="label6">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Single</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem7">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button5">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Split 
view</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" handler="on_split_clicked" 
last_modification_time="Sun, 12 Jan 2003 14:28:45 GMT"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment7">
+                         <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="hbox7">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image40">
+                                 <property name="visible">True</property>
+                                 <property 
name="stock">gtk-justify-fill</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="label7">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Split</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem8">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button6">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Full 
view</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" handler="on_full_clicked" 
last_modification_time="Sun, 12 Jan 2003 14:28:50 GMT"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment8">
+                         <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="hbox8">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image41">
+                                 <property name="visible">True</property>
+                                 <property 
name="stock">gtk-justify-fill</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="label8">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Full</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem9">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkVSeparator" id="vseparator3">
+                     <property name="visible">True</property>
+                   </widget>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem10">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button7">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Collapse the 
whole tree in the right frame</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="pressed" handler="on_collapse_pressed"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment9">
+                         <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="hbox9">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image42">
+                                 <property name="visible">True</property>
+                                 <property name="stock">gtk-remove</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="label9">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Collapse</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkToolItem" id="toolitem11">
+                 <property name="visible">True</property>
+                 <property name="visible_horizontal">True</property>
+                 <property name="visible_vertical">True</property>
+                 <property name="is_important">False</property>
+
+                 <child>
+                   <widget class="GtkButton" id="button8">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Expand the 
whole tree in the right frame</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="pressed" handler="on_expand_pressed"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment10">
+                         <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="hbox10">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image43">
+                                 <property name="visible">True</property>
+                                 <property name="stock">gtk-add</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="label10">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">Expand</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="expand">False</property>
+                 <property name="homogeneous">False</property>
+               </packing>
+             </child>
+           </widget>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">False</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkHPaned" id="hpaned1">
+         <property name="width_request">1</property>
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="position">0</property>
+
+         <child>
+           <widget class="GtkScrolledWindow" id="scrolledwindow1">
+             <property name="visible">True</property>
+             <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="shadow_type">GTK_SHADOW_IN</property>
+             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+             <child>
+               <widget class="GtkTreeView" id="treeview1">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="headers_visible">True</property>
+                 <property name="rules_hint">False</property>
+                 <property name="reorderable">False</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>
+                 <signal name="cursor_changed" 
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 
15:58:22 GMT"/>
+                 <signal name="button_press_event" 
handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan 
2003 16:03:52 GMT"/>
+                 <signal name="key_press_event" 
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 
16:11:44 GMT"/>
+               </widget>
+             </child>
+           </widget>
+           <packing>
+             <property name="shrink">True</property>
+             <property name="resize">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkVPaned" id="vpaned1">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="position">0</property>
+
+             <child>
+               <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                 <property name="visible">True</property>
+                 <property 
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                 <property 
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                 <property name="shadow_type">GTK_SHADOW_IN</property>
+                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                 <child>
+                   <widget class="GtkTreeView" id="treeview2">
+                     <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">False</property>
+                     <property name="reorderable">False</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>
+                     <signal name="cursor_changed" 
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 
15:57:55 GMT"/>
+                     <signal name="button_press_event" 
handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan 
2003 15:57:58 GMT"/>
+                     <signal name="key_press_event" 
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 
15:58:01 GMT"/>
+                   </widget>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="shrink">True</property>
+                 <property name="resize">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                 <property name="visible">True</property>
+                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                 <property 
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                 <property name="shadow_type">GTK_SHADOW_IN</property>
+                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                 <child>
+                   <widget class="GtkTextView" id="textview3">
+                     <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">True</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">0</property>
+                     <property name="right_margin">0</property>
+                     <property name="indent">0</property>
+                     <property name="text" translatable="yes">Sorry, no help 
available for this option yet.</property>
+                   </widget>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="shrink">True</property>
+                 <property name="resize">True</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="shrink">True</property>
+             <property name="resize">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>
+</widget>
+
+</glade-interface>

Modified: GNUnet/src/conf/gconf.gladep
===================================================================
--- GNUnet/src/conf/gconf.gladep        2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/gconf.gladep        2006-05-14 08:39:13 UTC (rev 2804)
@@ -4,7 +4,6 @@
 <glade-project>
   <name>gconf</name>
   <program_name>gconf</program_name>
-  <style>GNU</style>
   <gnome_support>FALSE</gnome_support>
   <main_source_file>gconf_interface.c</main_source_file>
   <main_header_file>gconf_interface.h</main_header_file>

Modified: GNUnet/src/conf/gnunet-setup.c
===================================================================
--- GNUnet/src/conf/gnunet-setup.c      2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/gnunet-setup.c      2006-05-14 08:39:13 UTC (rev 2804)
@@ -31,18 +31,7 @@
 #include "conf.h"
 #include "zconf_tab.h"
 
-#if HAVE_CURSES
-#include "mconf.h"
-#include "wizard_curs.h"
-#endif
 
-#if HAVE_GTK
-#include "gconf.h"
-#include "wizard.h"
-#include <gtk/gtk.h>
-#endif
-
-
 /**
  * Perform option parsing from the command line.
  */
@@ -200,8 +189,11 @@
   return cont;
 }
 
-int dyn_config(const char *module, const char *mainfunc, int argc, char 
**argv) {
-  void (*mptr)(int, char **);
+int dyn_config(const char *module, 
+              const char *mainfunc, 
+              int argc, 
+              char **argv) {
+  void (*mptr)(int, char **, void*);
   void *library;
 
   library = loadDynamicLibrary("libgnunet", module);
@@ -211,11 +203,8 @@
   mptr = bindDynamicMethod(library, mainfunc, "");
   if (! mptr)
     return SYSERR;
-  
-  mptr(argc, argv);
-  
-  unloadDynamicLibrary(library);
-  
+  mptr(argc, argv, library); 
+  unloadDynamicLibrary(library);  
   return YES;
 }
 
@@ -287,7 +276,7 @@
       errexit(_("Can only run wizard to configure gnunetd.\n"
                 "Did you forget the `%s' option?\n"), "-d");
 
-    if (dyn_config("setup_gtk", "wizard_main",
+    if (dyn_config("setup_gtk", "gtk_wizard_main",
           argc, argv) != YES) {
       FREE(operation);
       errexit(_("`%s' is not available."), "wizard-gtk");

Deleted: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c    2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard.c    2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,393 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2005 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
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file conf/wizard.c
- * @brief A easy-to-use configuration assistant
- * @author Nils Durner
- */
-
-#include "gnunet_util.h"
-#include "platform.h"
-
-#ifndef MINGW
-#include <grp.h>
-#endif
-
-
-#define LKC_DIRECT_LINK
-#include "lkc.h"
-
-#include <gtk/gtk.h>
-
-#include "wizard_interface.h"
-#include "wizard_support.h"
-#include "wizard_callbacks.h"
-#include "wizard_util.h"
-
-#include "wizard.h"
-#include "gconf.h"
-#include "confdata.h"
-
-GtkWidget *curwnd;
-GtkWidget *cmbNIC;
-
-int doOpenEnhConfigurator = 0;
-int doAutoStart = 0;
-char * user_name = NULL;
-char * group_name = NULL;
-static int nic_item_count = 0;
-
-void insert_nic(const char *name,
-                int defaultNIC,
-                void * cls)
-{
- gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), name);
-
-       defaultNIC = wiz_is_nic_default(name, defaultNIC);
-
-  /* Make default selection */
-  if (defaultNIC)
-  {
-       GtkTreeModel *model;
-       GtkTreeIter cur, last;
-       model = gtk_combo_box_get_model(GTK_COMBO_BOX(cmbNIC));
-       gtk_tree_model_get_iter_first(model, &cur);
-       last = cur;
-       while(gtk_tree_model_iter_next(model, &cur))
-       {
-               last = cur;
-       }
-       
-       gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmbNIC), &last);
-       on_cmbNIC_changed(GTK_COMBO_BOX(cmbNIC), NULL);
-  }
-
-       nic_item_count++;
-}
-
-void load_step2()
-{
-       struct symbol *sym;
-       
-       GtkWidget *vbox3, *frame1, *vbox4, *vbox5, *vbox6, *table1, *entIP,
-               *chkFW;
-       
-       vbox3 = lookup_widget(curwnd, "vbox3");
-       frame1 = lookup_widget(vbox3, "frame1");
-       vbox4 = lookup_widget(frame1, "vbox4");
-       vbox5 = lookup_widget(vbox4, "vbox5");
-       vbox6 = lookup_widget(vbox5, "vbox6");
-       table1 = lookup_widget(vbox6, "table1");
-       
-       cmbNIC = lookup_widget(table1, "cmbNIC");
-       entIP = lookup_widget(table1, "entIP");
-       chkFW = lookup_widget(table1, "chkFW");
-
-       sym = sym_find("INTERFACE", "NETWORK");
-       if (sym)
-       {
-               nic_item_count = 0;
-               enumNetworkIfs(insert_nic, NULL);
-
-               if (!nic_item_count)
-               {
-                       /* ifconfig unavailable */
-               GtkTreeIter iter;
-               GtkTreeModel *model;
-               char *nic;
-               
-                       sym_calc_value_ext(sym, 1);
-                       nic = (char *) sym_get_string_value(sym);
-
-                       if (!nic || strlen(nic) == 0)
-                               nic = "eth0";
-                       gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), nic);
-                       
-               model = gtk_combo_box_get_model(GTK_COMBO_BOX(cmbNIC));         
        
-               gtk_tree_model_get_iter_first(model, &iter);
-               gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmbNIC), &iter);
-               on_cmbNIC_changed(GTK_COMBO_BOX(cmbNIC), NULL);                 
-               }
-
-               gtk_widget_set_usize(cmbNIC, 10, -1);
-       }
-
-       sym = sym_find("IP", "NETWORK");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_entry_set_text(GTK_ENTRY(entIP), sym_get_string_value(sym));
-       }
-
-       sym = sym_find("LIMITED", "NAT");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkFW),
-                       sym_get_tristate_value(sym) != no);
-       }
-}
-
-void load_step3()
-{
-       struct symbol *sym;
-       GtkWidget *vbox7, *frame3, *vbox8, *vbox9, *vbox10, *frame4, *hbox24, 
*table2,
-               *frame5, *vbox11, *frame6, *hbox25, *entUp, *entDown, 
*radGNUnet, *radShare,
-               *entCPU;
-               
-       vbox7 = lookup_widget(curwnd, "vbox7");
-       frame3 = lookup_widget(vbox7, "frame3");
-       vbox8 = lookup_widget(frame3, "vbox8");
-       vbox9 = lookup_widget(vbox8, "vbox9");
-       vbox10 = lookup_widget(vbox9, "vbox10");
-       
-       frame4 = lookup_widget(vbox10, "frame4");
-       hbox24 = lookup_widget(frame4, "hbox24");
-       table2 = lookup_widget(hbox24, "table2");
-       
-       frame5 = lookup_widget(vbox10, "frame5");
-       vbox11 = lookup_widget(frame5, "vbox11");
-       
-       frame6 = lookup_widget(vbox10, "frame6");
-       hbox25 = lookup_widget(frame6, "hbox25");
-       
-       entUp = lookup_widget(table2, "entUp");
-       entDown = lookup_widget(table2, "entDown");
-       
-       radGNUnet = lookup_widget(vbox11, "radGNUnet");
-       radShare = lookup_widget(vbox11, "radShare");
-
-       entCPU = lookup_widget(hbox25, "entCPU");
-       
-       
-       sym = sym_find("MAXNETUPBPSTOTAL", "LOAD");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_entry_set_text(GTK_ENTRY(entUp), sym_get_string_value(sym));
-       }
-
-       sym = sym_find("MAXNETDOWNBPSTOTAL", "LOAD");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_entry_set_text(GTK_ENTRY(entDown), 
sym_get_string_value(sym));
-       }
-       
-       sym = sym_find("BASICLIMITING", "LOAD");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
-                       sym_get_tristate_value(sym) != no ? radGNUnet : 
radShare ), TRUE);
-       }
-
-       sym = sym_find("MAXCPULOAD", "LOAD");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_entry_set_text(GTK_ENTRY(entCPU), 
sym_get_string_value(sym));
-       }
-}
-
-void load_step4()
-{
-  struct symbol *sym;
-  GtkWidget *vbox18, *frame8, *vbox19, *table3, *entUser, *entGroup;
-  const char * uname = NULL;
-  const char * gname = NULL;
-
-  vbox18 = lookup_widget(curwnd, "vbox18");
-  frame8 = lookup_widget(vbox18, "frame8");
-  vbox19 = lookup_widget(frame8, "vbox19");
-  table3 = lookup_widget(vbox19, "table3");
-  entUser = lookup_widget(table3, "entUser");
-  entGroup = lookup_widget(table3, "entGroup");
-
-  if (NULL != user_name)
-  {
-    sym = sym_find("USER", "GNUNETD");
-    if (sym)
-    {
-      sym_calc_value_ext(sym, 1);
-      uname = sym_get_string_value(sym);
-    }
-  }
-
-  if (NULL != group_name)
-  {
-    sym = sym_find("GROUP", "GNUNETD");
-    if (sym)
-    {
-      sym_calc_value_ext(sym, 1);
-      gname = sym_get_string_value(sym);
-    }
-  }
-
-#ifndef MINGW
-  if (NULL == uname || strlen(uname) == 0)
-  {
-    if((geteuid() == 0) || (NULL != getpwnam("gnunet")))
-      user_name = STRDUP("gnunet");
-    else {
-      uname = getenv("USER");
-      if (uname != NULL)
-       user_name = STRDUP(uname);
-      else
-       user_name = NULL;
-    }
-  } else {
-    user_name = STRDUP(uname);
-  }
-  if(NULL == gname || strlen(gname) == 0)
-  {
-    struct group * grp;
-    if((geteuid() == 0) || (NULL != getgrnam("gnunet")))
-      group_name = STRDUP("gnunet");
-    else {
-      grp = getgrgid(getegid());
-      if ( (grp != NULL) &&
-          (grp->gr_name != NULL) )
-       group_name = STRDUP(grp->gr_name);
-      else
-       group_name = NULL;
-    }
-  } else {
-    group_name = STRDUP(gname);
-  }
-
-#else
-  if (NULL == uname || strlen(uname) == 0)
-    user_name = STRDUP("");
-  else
-    user_name = STRDUP(uname);
-  if (NULL == gname || strlen(gname) == 0)
-    group_name = STRDUP("");
-  else
-    group_name = STRDUP(gname);
-#endif
-
-  if(user_name)
-    gtk_entry_set_text(GTK_ENTRY(entUser), user_name);
-  if(group_name)
-    gtk_entry_set_text(GTK_ENTRY(entGroup), group_name);
-  if(isOSUserAddCapable())
-    gtk_widget_set_sensitive(entUser, TRUE);
-  else
-    gtk_widget_set_sensitive(entUser, FALSE);
-  if(isOSGroupAddCapable())
-    gtk_widget_set_sensitive(entGroup, TRUE);
-  else
-    gtk_widget_set_sensitive(entGroup, FALSE);
-}
-
-
-void load_step5()
-{
-       struct symbol *sym;
-       GtkWidget *vbox12, *frame7, *vbox13, *vbox14, *vbox15, *hbox53, 
*chkMigr,
-               *entQuota, *chkEnh, *chkStart;
-               
-       vbox12 = lookup_widget(curwnd, "vbox12");
-       frame7 = lookup_widget(vbox12, "frame7");
-       vbox13 = lookup_widget(frame7, "vbox13");
-       vbox14 = lookup_widget(vbox13, "vbox14");
-       vbox15 = lookup_widget(vbox14, "vbox15");
-
-       hbox53 = lookup_widget(vbox14, "hbox53");
-       entQuota = lookup_widget(hbox53, "entQuota");
-
-       chkMigr = lookup_widget(vbox14, "chkMigr");
-       chkStart = lookup_widget(vbox14, "chkStart");
-       chkEnh = lookup_widget(vbox14, "chkEnh");
-       
-       sym = sym_find("QUOTA", "FS");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_entry_set_text(GTK_ENTRY(entQuota), 
sym_get_string_value(sym));
-       }
-
-       sym = sym_find("ACTIVEMIGRATION", "FS");
-       if (sym)
-       {
-               sym_calc_value_ext(sym, 1);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkMigr),
-                       sym_get_tristate_value(sym) != no);
-       }
-
-       if (isOSAutostartCapable())
-               gtk_widget_set_sensitive(chkStart, TRUE);
-
-  sym = sym_find("AUTOSTART", "GNUNETD");
-  if (sym)
-  {
-    sym_calc_value_ext(sym, 1);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkStart),
-      sym_get_tristate_value(sym) != no);
-  }
-
-       if (doOpenEnhConfigurator)
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkEnh), 1);     
        
-}
-
-int wizard_main (int argc, char **argv)
-{
-  struct symbol *sym;
-  char * filename;
-       
-  gtk_init(&argc, &argv);
-  
-#ifdef ENABLE_NLS
-  /* GTK uses UTF-8 encoding */
-  bind_textdomain_codeset(PACKAGE, "UTF-8");
-#endif
-
-#ifdef WINDOWS
-  FreeConsole();
-#endif
-
-  gtk_set_locale ();
-
-  filename = getConfigurationString("GNUNET-SETUP",
-                                  "FILENAME");
-  conf_read(filename);
-  FREE(filename);
-
-  sym = sym_find("EXPERIMENTAL", "Meta");
-  sym_set_tristate_value(sym, yes);
-  sym = sym_find("ADVANCED", "Meta");
-  sym_set_tristate_value(sym, yes);
-  sym = sym_find("RARE", "Meta");
-  sym_set_tristate_value(sym, yes);
-
-  curwnd = create_assi_step1 ();
-  gtk_widget_show (curwnd);
-
-  gtk_main ();
-
-  if (doOpenEnhConfigurator)
-    gconf_main(argc, argv);
-  FREENONNULL(user_name);
-  FREENONNULL(group_name);
-
-  return 0;
-}

Modified: GNUnet/src/conf/wizard.glade
===================================================================
--- GNUnet/src/conf/wizard.glade        2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard.glade        2006-05-14 08:39:13 UTC (rev 2804)
@@ -19,6 +19,7 @@
   <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>
@@ -42,28 +43,28 @@
              <property name="can_focus">True</property>
              <property name="editable">False</property>
              <property name="overwrite">False</property>
-             <property name="accepts_tab">True</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">0</property>
-             <property name="pixels_below_lines">0</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">0</property>
-             <property name="right_margin">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
-       http://www.gnunet.org
+       http://gnunet.org
 and join our community at
-       http://www.gnunet.org/drupal/
+       https://gnunet.org/drupal/
 
 Have a lot of fun,
 
-the GNUnet team</property>
+The GNUnet team</property>
            </widget>
          </child>
        </widget>
@@ -98,7 +99,7 @@
              <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_step1_next_clicked" 
last_modification_time="Thu, 14 Apr 2005 17:32:18 GMT"/>
+             <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">
@@ -173,7 +174,7 @@
              <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" 
last_modification_time="Thu, 14 Apr 2005 17:32:41 GMT"/>
+             <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">
@@ -267,6 +268,7 @@
   <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>
@@ -431,7 +433,7 @@
                              <property name="has_frame">True</property>
                              <property name="invisible_char">*</property>
                              <property 
name="activates_default">False</property>
-                             <signal name="changed" handler="on_entIP_changed" 
last_modification_time="Sat, 16 Apr 2005 15:41:03 GMT"/>
+                             <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>
@@ -453,7 +455,7 @@
                              <property name="active">False</property>
                              <property name="inconsistent">False</property>
                              <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="on_chkFW_toggled" 
last_modification_time="Sun, 17 Apr 2005 15:46:13 GMT"/>
+                             <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>
@@ -471,7 +473,7 @@
                              <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" last_modification_time="Fri, 24 Jun 2005 19:32:04 
GMT"/>
+                             <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>
@@ -489,10 +491,6 @@
                          <property name="fill">True</property>
                        </packing>
                      </child>
-
-                     <child>
-                       <placeholder/>
-                     </child>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -503,8 +501,8 @@
                </widget>
                <packing>
                  <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
            </widget>
@@ -547,88 +545,13 @@
          <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkButton" id="step2_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="on_step2_back_clicked" 
last_modification_time="Thu, 14 Apr 2005 17:40:43 GMT"/>
-
-             <child>
-               <widget class="GtkAlignment" id="alignment33">
-                 <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="hbox56">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image66">
-                         <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="label87">
-                         <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="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="on_step2_next_clicked" 
last_modification_time="Thu, 14 Apr 2005 17:41:10 GMT"/>
+             <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">
@@ -703,7 +626,7 @@
              <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" 
last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
+             <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">
@@ -797,6 +720,7 @@
   <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>
@@ -942,7 +866,7 @@
                                      <property name="has_frame">True</property>
                                      <property 
name="invisible_char">*</property>
                                      <property 
name="activates_default">False</property>
-                                     <signal name="changed" 
handler="on_entUp_changed" last_modification_time="Sat, 16 Apr 2005 16:38:44 
GMT"/>
+                                     <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>
@@ -992,7 +916,7 @@
                                      <property name="has_frame">True</property>
                                      <property 
name="invisible_char">*</property>
                                      <property 
name="activates_default">False</property>
-                                     <signal name="changed" 
handler="on_entDown_changed" last_modification_time="Sat, 16 Apr 2005 16:38:48 
GMT"/>
+                                     <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>
@@ -1066,7 +990,7 @@
                                  <property name="active">False</property>
                                  <property name="inconsistent">False</property>
                                  <property 
name="draw_indicator">True</property>
-                                 <signal name="toggled" 
handler="on_radGNUnet_toggled" last_modification_time="Sat, 16 Apr 2005 
16:38:59 GMT"/>
+                                 <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>
@@ -1177,7 +1101,7 @@
                                  <property name="has_frame">True</property>
                                  <property name="invisible_char">*</property>
                                  <property 
name="activates_default">False</property>
-                                 <signal name="changed" 
handler="on_entCPU_changed" last_modification_time="Sat, 16 Apr 2005 16:39:09 
GMT"/>
+                                 <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>
@@ -1217,10 +1141,6 @@
                          <property name="fill">True</property>
                        </packing>
                      </child>
-
-                     <child>
-                       <placeholder/>
-                     </child>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -1281,7 +1201,7 @@
              <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_step3_back_clicked" 
last_modification_time="Thu, 14 Apr 2005 17:44:10 GMT"/>
+             <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">
@@ -1356,7 +1276,7 @@
              <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_step3_next_clicked" 
last_modification_time="Thu, 14 Apr 2005 17:44:21 GMT"/>
+             <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">
@@ -1431,7 +1351,7 @@
              <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" 
last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
+             <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">
@@ -1525,6 +1445,7 @@
   <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>
@@ -1624,7 +1545,7 @@
                          <property name="active">False</property>
                          <property name="inconsistent">False</property>
                          <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkMigr_toggled" 
last_modification_time="Sat, 16 Apr 2005 16:45:18 GMT"/>
+                         <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>
@@ -1675,7 +1596,7 @@
                              <property name="has_frame">True</property>
                              <property name="invisible_char">*</property>
                              <property 
name="activates_default">False</property>
-                             <signal name="changed" 
handler="on_entQuota_changed" last_modification_time="Sat, 16 Apr 2005 16:45:24 
GMT"/>
+                             <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>
@@ -1704,7 +1625,7 @@
                          <property name="active">False</property>
                          <property name="inconsistent">False</property>
                          <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkStart_toggled" 
last_modification_time="Sat, 16 Apr 2005 16:45:28 GMT"/>
+                         <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>
@@ -1725,7 +1646,7 @@
                          <property name="active">False</property>
                          <property name="inconsistent">False</property>
                          <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkEnh_toggled" 
last_modification_time="Sat, 16 Apr 2005 16:45:33 GMT"/>
+                         <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>
@@ -1746,7 +1667,7 @@
                          <property name="active">True</property>
                          <property name="inconsistent">False</property>
                          <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="on_chkUpdate_toggled" 
last_modification_time="Fri, 23 Dec 2005 23:21:01 GMT"/>
+                         <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>
@@ -1754,21 +1675,17 @@
                          <property name="fill">False</property>
                        </packing>
                      </child>
-
-                     <child>
-                       <placeholder/>
-                     </child>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">True</property>
+                     <property name="expand">False</property>
                      <property name="fill">True</property>
                    </packing>
                  </child>
                </widget>
                <packing>
                  <property name="padding">0</property>
-                 <property name="expand">True</property>
+                 <property name="expand">False</property>
                  <property name="fill">True</property>
                </packing>
              </child>
@@ -1818,7 +1735,7 @@
              <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_step5_back_clicked" 
last_modification_time="Thu, 14 Apr 2005 17:47:34 GMT"/>
+             <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">
@@ -1893,7 +1810,7 @@
              <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" 
last_modification_time="Thu, 14 Apr 2005 17:47:51 GMT"/>
+             <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">
@@ -1968,7 +1885,7 @@
              <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" 
last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
+             <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">
@@ -2060,6 +1977,7 @@
   <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>
 
   <child>
     <widget class="GtkVBox" id="vbox16">
@@ -2148,7 +2066,7 @@
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_saveYes_clicked" 
last_modification_time="Thu, 14 Apr 2005 19:30:39 GMT"/>
+             <signal name="clicked" handler="on_saveYes_clicked" 
object="msgSave" last_modification_time="Thu, 14 Apr 2005 19:30:39 GMT"/>
            </widget>
          </child>
 
@@ -2161,7 +2079,7 @@
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_saveNo_clicked" 
last_modification_time="Thu, 14 Apr 2005 19:30:31 GMT"/>
+             <signal name="clicked" handler="on_saveNo_clicked" 
object="msgSave" last_modification_time="Thu, 14 Apr 2005 19:30:31 GMT"/>
            </widget>
          </child>
        </widget>
@@ -2189,6 +2107,7 @@
   <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>
 
   <child>
     <widget class="GtkVBox" id="vbox17">
@@ -2277,7 +2196,7 @@
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_saveFailedOK_clicked" 
last_modification_time="Sat, 16 Apr 2005 10:26:12 GMT"/>
+             <signal name="clicked" handler="on_saveFailedOK_clicked" 
object="msgSaveFailed" last_modification_time="Sat, 16 Apr 2005 10:26:12 GMT"/>
            </widget>
          </child>
        </widget>
@@ -2307,6 +2226,7 @@
   <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>
@@ -2430,7 +2350,7 @@
                      <property name="has_frame">True</property>
                      <property name="invisible_char">*</property>
                      <property name="activates_default">False</property>
-                     <signal name="changed" handler="on_entUser_changed" 
last_modification_time="Tue, 21 Jun 2005 18:37:05 GMT"/>
+                     <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>
@@ -2452,7 +2372,7 @@
                      <property name="has_frame">True</property>
                      <property name="invisible_char">*</property>
                      <property name="activates_default">False</property>
-                     <signal name="changed" handler="on_entGroup_changed" 
last_modification_time="Tue, 21 Jun 2005 18:37:14 GMT"/>
+                     <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>
@@ -2493,7 +2413,7 @@
                </widget>
                <packing>
                  <property name="padding">0</property>
-                 <property name="expand">True</property>
+                 <property name="expand">False</property>
                  <property name="fill">True</property>
                </packing>
              </child>
@@ -2543,7 +2463,7 @@
              <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_step4_back_clicked" 
last_modification_time="Thu, 26 May 2005 17:57:25 GMT"/>
+             <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">
@@ -2618,7 +2538,7 @@
              <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_step4_next_clicked" 
last_modification_time="Thu, 26 May 2005 17:58:44 GMT"/>
+             <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">
@@ -2693,7 +2613,7 @@
              <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" 
last_modification_time="Thu, 14 Apr 2005 17:42:07 GMT"/>
+             <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">
@@ -2785,6 +2705,7 @@
   <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>
 
   <child>
     <widget class="GtkVBox" id="vbox20">
@@ -2873,7 +2794,7 @@
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <signal name="clicked" handler="on_updateFailedOK_clicked" 
last_modification_time="Fri, 23 Dec 2005 23:22:02 GMT"/>
+             <signal name="clicked" handler="on_updateFailedOK_clicked" 
object="msgUpdateFailed" last_modification_time="Fri, 23 Dec 2005 23:22:02 
GMT"/>
            </widget>
          </child>
        </widget>

Modified: GNUnet/src/conf/wizard.gladep
===================================================================
--- GNUnet/src/conf/wizard.gladep       2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard.gladep       2006-05-14 08:39:13 UTC (rev 2804)
@@ -4,8 +4,12 @@
 <glade-project>
   <name>Wizard-conf</name>
   <program_name>wizard-conf</program_name>
-  <style>GNU</style>
   <gnome_support>FALSE</gnome_support>
+  <use_widget_names>TRUE</use_widget_names>
+  <output_main_file>FALSE</output_main_file>
+  <output_support_files>FALSE</output_support_files>
+  <output_build_files>FALSE</output_build_files>
+  <backup_source_files>FALSE</backup_source_files>
   <main_source_file>wizard_interface.c</main_source_file>
   <main_header_file>wizard_interface.h</main_header_file>
   <handler_source_file>wizard_callbacks.c</handler_source_file>

Deleted: GNUnet/src/conf/wizard.h
===================================================================
--- GNUnet/src/conf/wizard.h    2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard.h    2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,33 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2001, 2002, 2005 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
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-
-/**
- * @file conf/wizard.h
- * @brief GNUnet Setup
- * @author Nils Durner
- */
-
-#ifndef WIZARD_H
-#define WIZARD_H
-
-int wizard_main(int argc, char **argv);
-
-#endif

Deleted: GNUnet/src/conf/wizard_callbacks.c
===================================================================
--- GNUnet/src/conf/wizard_callbacks.c  2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard_callbacks.c  2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,478 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2005 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
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file conf/gbasic-callbacks.c
- * @brief Callbacks for the GTK configuration assistant
- * @author Nils Durner
- */
-
-#include "platform.h"
-#include "confdata.h"
-
-#define LKC_DIRECT_LINK
-#include "lkc.h"
-
-
-#include <gtk/gtk.h>
-
-#include "wizard_callbacks.h"
-#include "wizard_interface.h"
-#include "wizard_support.h"
-#include "wizard_util.h"
-#include "wizard_gtk.h"
-
-#include "lkc.h"
-
-extern GtkWidget *curwnd;
-extern int doOpenEnhConfigurator;
-extern int doAutoStart;
-extern char * user_name;
-extern char * group_name;
-static int doUpdate = YES;
-
-GtkWidget *msgSave;
-GtkWidget *msgSaveFailed;
-GtkWidget *msgUpdateFailed;
-
-/* 1 = terminate app on "assi_destroy" */
-int quit;
-
-void
-on_step1_next_clicked (GtkButton * button, gpointer user_data)
-{
-       quit = 0;
-       gtk_widget_destroy(curwnd);
-       quit = 1;
-       
-       curwnd = create_assi_step2();
-       load_step2();
-       gtk_widget_show(curwnd);
-}
-
-
-void
-on_abort_clicked (GtkButton * button, gpointer user_data)
-{
-       msgSave = create_msgSave();
-       gtk_widget_show(msgSave);
-}
-
-
-void
-on_step2_back_clicked (GtkButton * button, gpointer user_data)
-{
-       quit = 0;
-       gtk_widget_destroy(curwnd);
-       quit = 1;
-       curwnd = create_assi_step1();
-       gtk_widget_show(curwnd);
-}
-
-
-void
-on_step2_next_clicked (GtkButton * button, gpointer user_data)
-{
-       quit = 0;
-       gtk_widget_destroy(curwnd);
-       quit = 1;
-       
-       curwnd = create_assi_step3();
-       load_step3();
-       gtk_widget_show(curwnd);
-}
-
-
-void
-on_step3_back_clicked (GtkButton * button, gpointer user_data)
-{
-       quit = 0;
-       gtk_widget_destroy(curwnd);
-       quit = 1;
-
-       curwnd = create_assi_step2();
-       load_step2();
-       gtk_widget_show(curwnd);
-}
-
-
-void
-on_step3_next_clicked (GtkButton * button, gpointer user_data)
-{
-       quit = 0;
-       gtk_widget_destroy(curwnd);
-       quit = 1;
-       
-       curwnd = create_assi_step4();
-       load_step4();
-       gtk_widget_show(curwnd);
-}
-
-
-void
-on_step5_back_clicked (GtkButton * button, gpointer user_data)
-{
-       quit = 0;
-       gtk_widget_destroy(curwnd);
-       quit = 1;
-       
-       curwnd = create_assi_step4();
-       load_step4();
-       gtk_widget_show(curwnd);
-}
-
-void showErr(char *prefix, char *error) {
-       GtkWidget *vbox17, *hbox67, *label98;
-       char *err;
-       
-       msgSaveFailed = create_msgSaveFailed();
-       
-       vbox17 = lookup_widget(msgSaveFailed, "vbox17");
-       hbox67 = lookup_widget(vbox17, "hbox67");
-       label98 = lookup_widget(vbox17, "label98");
-       
-       err = malloc(strlen(prefix) + strlen(error) + 2);
-       sprintf(err, "%s %s", prefix, error);
-       
-       gtk_label_set_text(GTK_LABEL(label98), err);
-       
-       free(err);
-       
-       gtk_widget_show(msgSaveFailed);
-}
-
-int
-save_conf ()
-{
-  char * filename;
-       
-  filename = getConfigurationString("GNUNET-SETUP",
-                                   "FILENAME");
-  if (conf_write(filename)) {
-    char * err;
-    const char * prefix;
-
-    prefix = _("Unable to save configuration file `%s':");
-
-    err = malloc(strlen(filename) + strlen(prefix) + 1);
-    sprintf(err, prefix, filename);
-    showErr(err, STRERROR(errno));
-    free(err);
-
-    free(filename);
-    return 0;
-  }
-  free(filename);      
-  return 1;
-}
-
-void
-on_finish_clicked (GtkButton * button, gpointer user_data)
-{  
-       if (doAutoStart && user_name)
-               if (!wiz_createGroupUser(group_name, user_name)) {
-#ifndef MINGW
-                       showErr(_("Unable to create user account:"), 
STRERROR(errno));
-#endif
-                       return;
-               }
-
-       if (!wiz_autostartService(doAutoStart, user_name, group_name)) {
-#ifndef MINGW
-               showErr(_("Unable to change startup process:"), 
STRERROR(errno));
-#endif
-       }       
-
-       if (!save_conf())
-               return;
-    
-  if (doUpdate) {
-    if (system("gnunet-update") != 0) {
-      msgUpdateFailed = create_msgUpdateFailed();
-      gtk_widget_show(msgUpdateFailed);
-    }
-    else
-      gtk_widget_destroy(curwnd);
-  }
-  else
-    gtk_widget_destroy(curwnd);
-}
-
-void
-on_saveYes_clicked (GtkButton * button, gpointer user_data)
-{
-       int i = save_conf();
-       
-       gtk_widget_destroy(msgSave);
-       if (i)
-       {
-               quit = 1;
-               gtk_widget_destroy(curwnd);
-       }
-}
-
-void
-on_saveNo_clicked (GtkButton * button, gpointer user_data)
-{
-       quit = 1;
-       gtk_widget_destroy(msgSave);
-       gtk_widget_destroy(curwnd);
-}
-
-void
-on_assi_destroy (GtkObject * object, gpointer user_data)
-{
-       /* Don't terminate if the user just clicked "Next" */
-       if (quit)
-               gtk_main_quit();
-}
-
-void
-on_saveFailedOK_clicked (GtkButton * button, gpointer user_data)
-{
-       gtk_widget_destroy(msgSaveFailed);
-}
-
-void
-on_updateFailedOK_clicked (GtkButton * button, gpointer user_data)
-{
-  gtk_widget_destroy(msgUpdateFailed);
-}
-
-void
-on_entIP_changed (GtkEditable * editable, gpointer user_data)
-{
-  struct symbol *sym;
-  gchar * ret;
-  
-  sym = sym_lookup("IP", "NETWORK", 0);
-  ret = gtk_editable_get_chars(editable, 0, -1);
-  sym_set_string_value(sym, ret);
-  g_free(ret);
-}
-
-
-void
-on_cmbNIC_changed (GtkComboBox * combobox, gpointer user_data)
-{
-       GtkTreeIter iter;
-       GValue val;
-       char *entry;
-#ifdef MINGW
-       char nic[21], *idx;
-       char *dst;
-#else
-       char *nic;
-#endif
-       struct symbol *sym;
-       GtkTreeModel *model;
-       
-       gtk_combo_box_get_active_iter(combobox, &iter);
-       model = gtk_combo_box_get_model(combobox);
-       memset(&val, 0, sizeof(val));
-       gtk_tree_model_get_value(model, &iter, 0, &val);
-       entry = (char *) g_value_get_string(&val);
-
-#ifdef MINGW
-       idx = strrchr(entry, '-');
-       if (! idx)
-               return;
-       idx += 2;
-       dst = nic;
-       while(*idx)
-               *dst++ = *idx++;
-       dst[-1] = 0;
-#else
-       nic = entry;
-#endif
-       sym = sym_lookup("INTERFACE", "NETWORK", 0);
-       sym_set_string_value(sym, nic);
-       sym = sym_lookup("INTERFACES", "LOAD", 0);
-       sym_set_string_value(sym, nic);
-}
-
-void
-on_chkFW_toggled (GtkToggleButton * togglebutton, gpointer user_data)
-{
-       struct symbol *sym = sym_lookup("LIMITED", "NAT", 0);
-       sym_set_tristate_value(sym,
-               gtk_toggle_button_get_active(togglebutton) ? yes : no);
-}
-
-void
-on_entUp_changed (GtkEditable * editable, gpointer user_data)
-{
-  gchar * ret;
-  struct symbol *sym;
-
-  sym = sym_lookup("MAXNETUPBPSTOTAL", "LOAD", 0);
-  ret = gtk_editable_get_chars(editable, 0, -1);
-  sym_set_string_value(sym, ret);
-  g_free(ret);
-}
-
-
-void
-on_entDown_changed (GtkEditable * editable, gpointer user_data)
-{
-  struct symbol *sym;
-  gchar * ret;
-
-  sym = sym_lookup("MAXNETDOWNBPSTOTAL", "LOAD", 0);
-  ret = gtk_editable_get_chars(editable, 0, -1);
-  sym_set_string_value(sym, ret);
-  g_free(ret);
-}
-
-
-void
-on_radGNUnet_toggled (GtkToggleButton * togglebutton, gpointer user_data)
-{
-  struct symbol *sym = sym_lookup("BASICLIMITING", "LOAD", 0);
-  sym_set_tristate_value(sym,  
-                        gtk_toggle_button_get_active(togglebutton) ? yes : no);
-}
-
-
-void
-on_radShare_toggled (GtkToggleButton * togglebutton, gpointer user_data)
-{
-  struct symbol *sym = sym_lookup("BASICLIMITING", "LOAD", 0);
-  sym_set_tristate_value(sym,  
-                        gtk_toggle_button_get_active(togglebutton) ? no : yes);
-}
-
-
-void
-on_entCPU_changed (GtkEditable * editable, gpointer user_data)
-{
-  struct symbol *sym;
-  gchar * ret;
-
-  sym = sym_lookup("MAXCPULOAD", "LOAD", 0);
-  ret = gtk_editable_get_chars(editable, 0, -1);
-  sym_set_string_value(sym, ret);
-  g_free(ret);
-}
-
-void
-on_chkMigr_toggled (GtkToggleButton * togglebutton, gpointer user_data)
-{
-  struct symbol *sym = sym_lookup("ACTIVEMIGRATION", "FS", 0);
-  sym_set_tristate_value(sym,
-                        gtk_toggle_button_get_active(togglebutton) ? yes : no);
-}
-
-void
-on_entQuota_changed (GtkEditable * editable, gpointer user_data)
-{
-  struct symbol *sym;
-  gchar * ret;
-
-  sym = sym_lookup("QUOTA", "FS", 0);
-  ret = gtk_editable_get_chars(editable, 0, -1);
-  sym_set_string_value(sym, ret);
-  g_free(ret);
-}
-
-
-void
-on_chkStart_toggled (GtkToggleButton * togglebutton, gpointer user_data)
-{
-  struct symbol *sym = sym_lookup("AUTOSTART", "GNUNETD", 0);
-
-  doAutoStart = gtk_toggle_button_get_active(togglebutton);
-  sym_set_tristate_value(sym, doAutoStart ? yes : no);
-}
-
-
-void
-on_chkEnh_toggled (GtkToggleButton * togglebutton, gpointer user_data)
-{
-  doOpenEnhConfigurator = gtk_toggle_button_get_active(togglebutton);
-}
-
-void
-on_chkUpdate_toggled (GtkToggleButton * togglebutton, gpointer user_data)
-{
-  doUpdate = gtk_toggle_button_get_active(togglebutton);
-}
-
-void
-on_step4_back_clicked (GtkButton * button, gpointer user_data)
-{
-  quit = 0;
-  gtk_widget_destroy(curwnd);
-  quit = 1;
-  
-  curwnd = create_assi_step3();
-  load_step3();
-  gtk_widget_show(curwnd);
-}
-
-void
-on_step4_next_clicked (GtkButton * button, gpointer user_data)
-{
-  quit = 0;
-  gtk_widget_destroy(curwnd);
-  quit = 1;
-  
-  curwnd = create_assi_step5();
-  load_step5();
-  gtk_widget_show(curwnd);
-}
-
-void
-on_entUser_changed (GtkEditable * editable, gpointer user_data)
-{
-  struct symbol *sym;
-  gchar * ret;
-
-  sym = sym_lookup("USER", "GNUNETD", 0);
-  ret = gtk_editable_get_chars(editable, 0, -1);
-  GNUNET_ASSERT(ret != NULL);
-  sym_set_string_value(sym, ret);
-  FREENONNULL(user_name);
-  if (strlen(ret) != 0)
-    user_name = STRDUP(ret);
-  else
-    user_name = NULL;
-  g_free(ret);
-  
-}
-
-
-void
-on_entGroup_changed (GtkEditable * editable, gpointer user_data)
-{
-  struct symbol *sym;
-  gchar * ret;
-
-  FREENONNULL(group_name);
-  ret = gtk_editable_get_chars(editable, 0, -1);
-  GNUNET_ASSERT(ret != NULL);
-  sym_set_string_value(sym, ret);
-  if (strlen(ret) != 0)
-    group_name = STRDUP(ret);
-  else
-    group_name = NULL;
-  sym = sym_lookup("GROUP", "GNUNETD", 0);
-  g_free(ret);
-}

Deleted: GNUnet/src/conf/wizard_callbacks.h
===================================================================
--- GNUnet/src/conf/wizard_callbacks.h  2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard_callbacks.h  2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,66 +0,0 @@
-#include "platform.h"
-#include "gnunet_util.h"
-
-#include <gtk/gtk.h>
-
-
-void on_step1_next_clicked (GtkButton * button, gpointer user_data);
-
-void on_abort_clicked (GtkButton * button, gpointer user_data);
-
-void on_step2_back_clicked (GtkButton * button, gpointer user_data);
-
-void on_step2_next_clicked (GtkButton * button, gpointer user_data);
-
-void on_step3_back_clicked (GtkButton * button, gpointer user_data);
-
-void on_step3_next_clicked (GtkButton * button, gpointer user_data);
-
-void on_step5_back_clicked (GtkButton * button, gpointer user_data);
-
-void on_finish_clicked (GtkButton * button, gpointer user_data);
-
-void on_saveYes_clicked (GtkButton * button, gpointer user_data);
-
-void on_saveNo_clicked (GtkButton * button, gpointer user_data);
-
-void on_assi_destroy (GtkObject * object, gpointer user_data);
-
-void on_saveFailedOK_clicked (GtkButton * button, gpointer user_data);
-
-void on_updateFailedOK_clicked (GtkButton * button, gpointer user_data);
-
-void on_entIP_changed (GtkEditable * editable, gpointer user_data);
-
-void on_cmbNIC_changed (GtkComboBox * combobox, gpointer user_data);
-
-void on_chkFW_toggled (GtkToggleButton * togglebutton, gpointer user_data);
-
-void on_entUp_changed (GtkEditable * editable, gpointer user_data);
-
-void on_entDown_changed (GtkEditable * editable, gpointer user_data);
-
-void
-on_radGNUnet_toggled (GtkToggleButton * togglebutton, gpointer user_data);
-
-void on_radShare_toggled (GtkToggleButton * togglebutton, gpointer user_data);
-
-void on_entCPU_changed (GtkEditable * editable, gpointer user_data);
-
-void on_chkMigr_toggled (GtkToggleButton * togglebutton, gpointer user_data);
-
-void on_entQuota_changed (GtkEditable * editable, gpointer user_data);
-
-void on_chkStart_toggled (GtkToggleButton * togglebutton, gpointer user_data);
-
-void on_chkEnh_toggled (GtkToggleButton * togglebutton, gpointer user_data);
-
-void on_chkUpdate_toggled (GtkToggleButton * togglebutton, gpointer user_data);
-
-void on_step4_back_clicked (GtkButton * button, gpointer user_data);
-
-void on_step4_next_clicked (GtkButton * button, gpointer user_data);
-
-void on_entUser_changed (GtkEditable * editable, gpointer user_data);
-
-void on_entGroup_changed (GtkEditable * editable, gpointer user_data);

Copied: GNUnet/src/conf/wizard_gtk.c (from rev 2802, GNUnet/src/conf/wizard.c)
===================================================================
--- GNUnet/src/conf/wizard.c    2006-05-14 02:04:44 UTC (rev 2802)
+++ GNUnet/src/conf/wizard_gtk.c        2006-05-14 08:39:13 UTC (rev 2804)
@@ -0,0 +1,774 @@
+/*
+     This file is part of GNUnet.
+     (C) 2005, 2006 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
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file conf/wizard_gtk.c
+ * @brief A easy-to-use configuration assistant
+ * @author Nils Durner
+ */
+
+#include "gnunet_util.h"
+#include "platform.h"
+#include <gtk/gtk.h>
+#include <gtk/gtktext.h>
+#include <glade/glade.h>
+
+#ifndef MINGW
+#include <grp.h>
+#endif
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+#include "wizard_util.h"
+#include "wizard_gtk.h"
+#include "gconf.h"
+#include "confdata.h"
+
+/**
+ * Handle to the dynamic library (which contains this code)
+ */
+static void * library;
+
+/**
+ * Current open window. 
+ */
+static GtkWidget *curwnd;
+
+/**
+ * Current glade handle.
+ */
+static GladeXML * mainXML;
+
+static int doOpenEnhConfigurator = 0;
+
+static int doAutoStart = 0;
+
+static int doUpdate = YES;
+
+static char * user_name = NULL;
+
+static char * group_name = NULL;
+
+
+/* 1 = terminate app on "assi_destroy" */
+static int quit;
+
+/**
+ * Destroy the current window (without exiting).
+ * Also unrefs the current glade XML context.
+ */
+static void destroyCurrentWindow() {
+  GNUNET_ASSERT(mainXML != NULL);
+  GNUNET_ASSERT(curwnd != NULL);
+  quit = 0;
+  gtk_widget_destroy(curwnd);
+  curwnd = NULL;
+  g_object_unref(mainXML);
+  mainXML = NULL;
+  quit = 1;
+}
+
+void on_assi_destroy (GtkObject * object, 
+                     gpointer user_data) {
+  /* Don't terminate if the user just clicked "Next" */
+  if (quit)
+    gtk_main_quit();
+}
+
+static char * get_glade_filename() {
+  char * gladeFile;
+
+#ifdef MINGW
+  gladeFile = MALLOC(_MAX_PATH + 1);
+  plibc_conv_to_win_path(DATADIR"/wizard.glade",
+                        gladeFile);
+#else
+  gladeFile = STRDUP(DATADIR"/wizard.glade");
+#endif
+  return gladeFile;
+}
+
+static void connector(const gchar *handler_name,
+                     GObject *object,
+                     const gchar *signal_name,
+                     const gchar *signal_data,
+                     GObject *connect_object,
+                     gboolean after,
+                     gpointer user_data) {
+  GladeXML * xml = user_data;
+  void * method;
+
+  method = trybindDynamicMethod(library,
+                               "",
+                               handler_name);
+  if (method == NULL) {
+    LOG(LOG_DEBUG,
+       _("Failed to find handler for `%s'\n"),
+       handler_name);
+    return;
+  }
+  glade_xml_signal_connect(xml,
+                          handler_name,
+                          (GCallback) method);
+}
+
+static GtkWidget * get_xml(const char * dialog_name) {
+  char * gladeFile;
+
+  gladeFile = get_glade_filename();
+  mainXML = glade_xml_new(gladeFile,
+                         dialog_name,
+                         PACKAGE_NAME);
+  if (mainXML == NULL)
+    errexit(_("Failed to open `%s'.\n"),
+           gladeFile);  
+  FREE(gladeFile);
+  glade_xml_signal_autoconnect_full(mainXML, &connector, mainXML);
+  return glade_xml_get_widget(mainXML,
+                             dialog_name);
+}
+
+/**
+ * Helper function to just show a simple dialog
+ * that requires no initialization.
+ */
+static void showDialog(const char * name) {
+  GtkWidget * msgSave;
+  char * gladeFile;
+  GladeXML * myXML;
+  
+  gladeFile = get_glade_filename();
+  myXML = glade_xml_new(gladeFile,
+                       name,
+                       PACKAGE_NAME);
+  if (mainXML == NULL)
+    errexit(_("Failed to open `%s'.\n"),
+           gladeFile);  
+  FREE(gladeFile);
+  glade_xml_signal_autoconnect_full(myXML, &connector, myXML);
+  msgSave = glade_xml_get_widget(myXML,
+                                name);
+  gtk_widget_show(msgSave);
+  g_object_unref(myXML);
+}
+
+struct insert_nic_cls {
+  GtkWidget * cmbNIC;
+  int nic_item_count;
+};
+
+void on_cmbNIC_changed (GtkComboBox * combobox, 
+                       gpointer user_data) {
+  GtkTreeIter iter;
+  GValue val;
+  char *entry;
+#ifdef MINGW
+  char nic[21], *idx;
+  char *dst;
+#else
+  char *nic;
+#endif
+  struct symbol *sym;
+  GtkTreeModel *model;
+  
+  gtk_combo_box_get_active_iter(combobox, &iter);
+  model = gtk_combo_box_get_model(combobox);
+  memset(&val, 0, sizeof(val));
+  gtk_tree_model_get_value(model, &iter, 0, &val);
+  entry = (char *) g_value_get_string(&val);
+  
+#ifdef MINGW
+  idx = strrchr(entry, '-');
+  if (! idx)
+    return;
+  idx += 2;
+  dst = nic;
+  while(*idx)
+    *dst++ = *idx++;
+  dst[-1] = 0;
+#else
+  nic = entry;
+#endif
+  sym = sym_lookup("INTERFACE", "NETWORK", 0);
+  sym_set_string_value(sym, nic);
+  sym = sym_lookup("INTERFACES", "LOAD", 0);
+  sym_set_string_value(sym, nic);
+}
+
+static void insert_nic(const char *name,
+                      int defaultNIC,
+                      void * cls) {
+  struct insert_nic_cls * inc = cls;
+  GtkWidget * cmbNIC = inc->cmbNIC;
+  GtkTreeModel *model;
+  GtkTreeIter cur;
+  GtkTreeIter last;
+
+  gtk_combo_box_append_text(GTK_COMBO_BOX(cmbNIC), name);
+  defaultNIC = wiz_is_nic_default(name, defaultNIC);
+
+  /* Make default selection */
+  if (defaultNIC) {
+    model = gtk_combo_box_get_model(GTK_COMBO_BOX(cmbNIC));
+    gtk_tree_model_get_iter_first(model, &cur);
+    last = cur;
+    while(gtk_tree_model_iter_next(model, &cur)) {
+      last = cur;
+    }
+    
+    gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cmbNIC), &last);
+    on_cmbNIC_changed(GTK_COMBO_BOX(cmbNIC), NULL);
+  }
+  inc->nic_item_count++;
+}
+
+void load_step2(GtkButton * button,
+               gpointer prev_window) {
+  struct symbol *sym;
+  GtkWidget * entIP;
+  GtkWidget * chkFW;
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  char *nic;
+  struct insert_nic_cls cls;
+
+  destroyCurrentWindow();
+  curwnd = get_xml("assi_step2");      
+  cls.cmbNIC = glade_xml_get_widget(mainXML, "cmbNIC");
+  GNUNET_ASSERT(cls.cmbNIC != NULL);
+  cls.nic_item_count = 0;
+  entIP = glade_xml_get_widget(mainXML, "entIP");
+  
+  sym = sym_find("INTERFACE", "NETWORK");
+  if (sym != NULL) {
+    enumNetworkIfs(&insert_nic, &cls);
+    
+    if (cls.nic_item_count != 0) {
+      /* ifconfig unavailable */
+      
+      sym_calc_value_ext(sym, 1);
+      nic = (char *) sym_get_string_value(sym);
+      
+      if (!nic || strlen(nic) == 0)
+       nic = "eth0";
+      gtk_combo_box_append_text(GTK_COMBO_BOX(cls.cmbNIC), nic);
+      
+      model = gtk_combo_box_get_model(GTK_COMBO_BOX(cls.cmbNIC));              
+      gtk_tree_model_get_iter_first(model, &iter);
+      gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cls.cmbNIC), &iter);
+      on_cmbNIC_changed(GTK_COMBO_BOX(cls.cmbNIC), NULL);                      
+    }
+    
+    gtk_widget_set_usize(cls.cmbNIC, 10, -1);
+  }
+  
+  sym = sym_find("IP", "NETWORK");
+  if (sym != NULL) {
+    sym_calc_value_ext(sym, 1);
+    gtk_entry_set_text(GTK_ENTRY(entIP), sym_get_string_value(sym));
+  }
+  
+  sym = sym_find("LIMITED", "NAT");
+  if (sym != NULL) {
+    sym_calc_value_ext(sym, 1);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkFW),
+                                sym_get_tristate_value(sym) != no);
+  }
+  gtk_widget_show(curwnd);
+}
+
+void load_step3(GtkButton * button,
+               gpointer prev_window) {
+  struct symbol *sym;
+  GtkWidget * entUp;
+  GtkWidget * entDown;
+  GtkWidget * radGNUnet;
+  GtkWidget * radShare;
+  GtkWidget * entCPU;
+  
+  destroyCurrentWindow();
+  curwnd = get_xml("assi_step3");
+  entUp = glade_xml_get_widget(mainXML, "entUp");
+  entDown = glade_xml_get_widget(mainXML, "entDown");  
+  radGNUnet = glade_xml_get_widget(mainXML, "radGNUnet");
+  radShare = glade_xml_get_widget(mainXML, "radShare");  
+  entCPU = glade_xml_get_widget(mainXML, "entCPU");
+       
+  sym = sym_find("MAXNETUPBPSTOTAL", "LOAD");
+  if (sym) {
+    sym_calc_value_ext(sym, 1);
+    gtk_entry_set_text(GTK_ENTRY(entUp), sym_get_string_value(sym));
+  }
+  sym = sym_find("MAXNETDOWNBPSTOTAL", "LOAD");
+  if (sym) {
+    sym_calc_value_ext(sym, 1);
+    gtk_entry_set_text(GTK_ENTRY(entDown), sym_get_string_value(sym));
+  }
+  sym = sym_find("BASICLIMITING", "LOAD");
+  if (sym) {
+    sym_calc_value_ext(sym, 1);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sym_get_tristate_value(sym) 
!= no 
+                                                  ? radGNUnet 
+                                                  : radShare ), 
+                                TRUE);
+  }
+  sym = sym_find("MAXCPULOAD", "LOAD");
+  if (sym) {
+    sym_calc_value_ext(sym, 1);
+    gtk_entry_set_text(GTK_ENTRY(entCPU), sym_get_string_value(sym));
+  }
+  gtk_widget_show(curwnd);
+}
+
+void load_step4(GtkButton * button,
+               gpointer prev_window) {
+  struct symbol *sym;
+  GtkWidget * entUser;
+  GtkWidget * entGroup;
+  const char * uname = NULL;
+  const char * gname = NULL;
+
+  destroyCurrentWindow();
+  curwnd = get_xml("assi_step4");
+  entUser = glade_xml_get_widget(mainXML, "entUser");
+  entGroup = glade_xml_get_widget(mainXML, "entGroup");
+
+  if (NULL != user_name) {
+    sym = sym_find("USER", "GNUNETD");
+    if (sym) {
+      sym_calc_value_ext(sym, 1);
+      uname = sym_get_string_value(sym);
+    }
+  }
+
+  if (NULL != group_name) {
+    sym = sym_find("GROUP", "GNUNETD");
+    if (sym) {
+      sym_calc_value_ext(sym, 1);
+      gname = sym_get_string_value(sym);
+    }
+  }
+
+#ifndef MINGW
+  if (NULL == uname || strlen(uname) == 0) {
+    if((geteuid() == 0) || (NULL != getpwnam("gnunet")))
+      user_name = STRDUP("gnunet");
+    else {
+      uname = getenv("USER");
+      if (uname != NULL)
+       user_name = STRDUP(uname);
+      else
+       user_name = NULL;
+    }
+  } else {
+    user_name = STRDUP(uname);
+  }
+  if(NULL == gname || strlen(gname) == 0)
+  {
+    struct group * grp;
+    if((geteuid() == 0) || (NULL != getgrnam("gnunet")))
+      group_name = STRDUP("gnunet");
+    else {
+      grp = getgrgid(getegid());
+      if ( (grp != NULL) &&
+          (grp->gr_name != NULL) )
+       group_name = STRDUP(grp->gr_name);
+      else
+       group_name = NULL;
+    }
+  } else {
+    group_name = STRDUP(gname);
+  }
+
+#else
+  if (NULL == uname || strlen(uname) == 0)
+    user_name = STRDUP("");
+  else
+    user_name = STRDUP(uname);
+  if (NULL == gname || strlen(gname) == 0)
+    group_name = STRDUP("");
+  else
+    group_name = STRDUP(gname);
+#endif
+
+  if(user_name)
+    gtk_entry_set_text(GTK_ENTRY(entUser), user_name);
+  if(group_name)
+    gtk_entry_set_text(GTK_ENTRY(entGroup), group_name);
+  if(isOSUserAddCapable())
+    gtk_widget_set_sensitive(entUser, TRUE);
+  else
+    gtk_widget_set_sensitive(entUser, FALSE);
+  if(isOSGroupAddCapable())
+    gtk_widget_set_sensitive(entGroup, TRUE);
+  else
+    gtk_widget_set_sensitive(entGroup, FALSE);
+  gtk_widget_show(curwnd);
+}
+
+
+void load_step5(GtkButton * button,
+               gpointer prev_window) {
+  struct symbol *sym;
+  GtkWidget * chkMigr;
+  GtkWidget * entQuota;
+  GtkWidget * chkEnh;
+  GtkWidget * chkStart;
+  
+  destroyCurrentWindow();
+  curwnd = get_xml("assi_step5");
+  entQuota =  glade_xml_get_widget(mainXML, "entQuota"); 
+  chkMigr =  glade_xml_get_widget(mainXML, "chkMigr");
+  chkStart =  glade_xml_get_widget(mainXML, "chkStart");
+  chkEnh =  glade_xml_get_widget(mainXML, "chkEnh");
+  
+  sym = sym_find("QUOTA", "FS");
+  if (sym) {
+    sym_calc_value_ext(sym, 1);
+    gtk_entry_set_text(GTK_ENTRY(entQuota), sym_get_string_value(sym));
+  }
+  
+  sym = sym_find("ACTIVEMIGRATION", "FS");
+  if (sym) {
+    sym_calc_value_ext(sym, 1);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkMigr),
+                                sym_get_tristate_value(sym) != no);
+  }
+  
+  if (isOSAutostartCapable())
+    gtk_widget_set_sensitive(chkStart, TRUE);
+  
+  sym = sym_find("AUTOSTART", "GNUNETD");
+  if (sym) {
+    sym_calc_value_ext(sym, 1);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkStart),
+      sym_get_tristate_value(sym) != no);
+  }
+
+  if (doOpenEnhConfigurator)
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkEnh), 1);                
+  gtk_widget_show(curwnd);
+}
+
+void on_saveFailedOK_clicked (GtkButton * button, 
+                             gpointer user_data) {
+  GtkWidget * msgSaveFailed = user_data;
+  gtk_widget_destroy(msgSaveFailed);
+}
+
+static void showErr(const char * prefix, 
+                   const char * error) {
+  GtkWidget * label98;
+  GtkWidget * msgSaveFailed;
+  char * err;  
+  char * gladeFile;
+  GladeXML * myXML;
+  
+  gladeFile = get_glade_filename();
+  myXML = glade_xml_new(gladeFile,
+                       "msgSaveFailed",
+                       PACKAGE_NAME);
+  if (mainXML == NULL)
+    errexit(_("Failed to open `%s'.\n"),
+           gladeFile);  
+  FREE(gladeFile);
+  glade_xml_signal_autoconnect(myXML);
+  msgSaveFailed = glade_xml_get_widget(myXML,
+                                      "msgSaveFailed");
+  label98 = glade_xml_get_widget(myXML, "label98");  
+  err = MALLOC(strlen(prefix) + strlen(error) + 2);
+  sprintf(err, 
+         "%s %s", 
+         prefix, 
+         error);  
+  gtk_label_set_text(GTK_LABEL(label98), err);  
+  FREE(err);  
+  gtk_widget_show(msgSaveFailed);
+  g_object_unref(myXML);
+}
+
+
+static int save_conf() {
+  char * err;
+  const char * prefix;
+  char * filename;
+       
+  filename = getConfigurationString("GNUNET-SETUP",
+                                   "FILENAME");
+  if (conf_write(filename)) {
+    prefix = _("Unable to save configuration file `%s':");
+
+    err = MALLOC(strlen(filename) + strlen(prefix) + 1);
+    sprintf(err, prefix, filename);
+    showErr(err, STRERROR(errno));
+    FREE(err);
+
+    FREE(filename);
+    return SYSERR;
+  }
+  FREE(filename);      
+  return OK;
+}
+
+void on_saveYes_clicked (GtkButton * button, 
+                        gpointer user_data) {
+  int i;
+  GtkWidget * msgSave = user_data;
+
+  i = save_conf();  
+  gtk_widget_destroy(msgSave);
+  if (OK == i) {
+    quit = 1;
+    gtk_widget_destroy(curwnd);
+  }
+}
+
+void on_saveNo_clicked (GtkButton * button, 
+                       gpointer user_data) {
+  GtkWidget * msgSave = user_data;
+
+  quit = 1;
+  gtk_widget_destroy(msgSave);
+  gtk_widget_destroy(curwnd);
+}
+
+void on_abort_clicked(GtkButton * button, 
+                     gpointer user_data) {
+  showDialog("msgSave");
+}
+
+void on_finish_clicked (GtkButton * button, 
+                       gpointer user_data) {  
+  if (doAutoStart && (user_name != NULL))
+    if (!wiz_createGroupUser(group_name, user_name)) {
+#ifndef MINGW
+      showErr(_("Unable to create user account:"), STRERROR(errno));
+#endif
+      return;
+    }
+  
+  if (!wiz_autostartService(doAutoStart, user_name, group_name)) {
+#ifndef MINGW
+    showErr(_("Unable to change startup process:"), STRERROR(errno));
+#endif
+  }    
+  
+  if (OK != save_conf())
+    return;
+  
+  if (doUpdate &&
+      (system("gnunet-update") != 0) )
+    showDialog("msgUpdateFailed");  
+  else
+    gtk_widget_destroy(curwnd);
+}
+
+void on_updateFailedOK_clicked (GtkButton * button, 
+                               gpointer user_data) {
+  GtkWidget * dialog = user_data;
+  gtk_widget_destroy(dialog);
+}
+
+void on_entIP_changed (GtkEditable * editable, 
+                      gpointer user_data) {
+  struct symbol *sym;
+  gchar * ret;
+  
+  sym = sym_lookup("IP", "NETWORK", 0);
+  ret = gtk_editable_get_chars(editable, 0, -1);
+  sym_set_string_value(sym, ret);
+  g_free(ret);
+}
+
+
+void on_chkFW_toggled (GtkToggleButton * togglebutton, 
+                      gpointer user_data) {
+  struct symbol *sym = sym_lookup("LIMITED", "NAT", 0);
+  sym_set_tristate_value(sym,
+                        gtk_toggle_button_get_active(togglebutton) ? yes : no);
+}
+
+void on_entUp_changed (GtkEditable * editable, 
+                      gpointer user_data) {
+  gchar * ret;
+  struct symbol *sym;
+  
+  sym = sym_lookup("MAXNETUPBPSTOTAL", "LOAD", 0);
+  ret = gtk_editable_get_chars(editable, 0, -1);
+  sym_set_string_value(sym, ret);
+  g_free(ret);
+}
+
+
+void on_entDown_changed (GtkEditable * editable, 
+                        gpointer user_data) {
+  struct symbol *sym;
+  gchar * ret;
+
+  sym = sym_lookup("MAXNETDOWNBPSTOTAL", "LOAD", 0);
+  ret = gtk_editable_get_chars(editable, 0, -1);
+  sym_set_string_value(sym, ret);
+  g_free(ret);
+}
+
+
+void on_radGNUnet_toggled(GtkToggleButton * togglebutton, 
+                         gpointer user_data) {
+  struct symbol *sym = sym_lookup("BASICLIMITING", "LOAD", 0);
+  sym_set_tristate_value(sym,  
+                        gtk_toggle_button_get_active(togglebutton) ? yes : no);
+}
+
+
+void on_radShare_toggled (GtkToggleButton * togglebutton, 
+                         gpointer user_data) {
+  struct symbol *sym = sym_lookup("BASICLIMITING", "LOAD", 0);
+  sym_set_tristate_value(sym,  
+                        gtk_toggle_button_get_active(togglebutton) ? no : yes);
+}
+
+
+void on_entCPU_changed (GtkEditable * editable, 
+                       gpointer user_data) {
+  struct symbol *sym;
+  gchar * ret;
+
+  sym = sym_lookup("MAXCPULOAD", "LOAD", 0);
+  ret = gtk_editable_get_chars(editable, 0, -1);
+  sym_set_string_value(sym, ret);
+  g_free(ret);
+}
+
+void on_chkMigr_toggled (GtkToggleButton * togglebutton, 
+                        gpointer user_data) {
+  struct symbol *sym = sym_lookup("ACTIVEMIGRATION", "FS", 0);
+  sym_set_tristate_value(sym,
+                        gtk_toggle_button_get_active(togglebutton) ? yes : no);
+}
+
+void on_entQuota_changed (GtkEditable * editable, 
+                         gpointer user_data) {
+  struct symbol *sym;
+  gchar * ret;
+
+  sym = sym_lookup("QUOTA", "FS", 0);
+  ret = gtk_editable_get_chars(editable, 0, -1);
+  sym_set_string_value(sym, ret);
+  g_free(ret);
+}
+
+
+void on_chkStart_toggled (GtkToggleButton * togglebutton, 
+                         gpointer user_data) {
+  struct symbol *sym = sym_lookup("AUTOSTART", "GNUNETD", 0);
+  doAutoStart = gtk_toggle_button_get_active(togglebutton);
+  sym_set_tristate_value(sym, doAutoStart ? yes : no);
+}
+
+
+void on_chkEnh_toggled (GtkToggleButton * togglebutton, 
+                       gpointer user_data) {
+  doOpenEnhConfigurator = gtk_toggle_button_get_active(togglebutton);
+}
+
+void on_chkUpdate_toggled(GtkToggleButton * togglebutton, 
+                         gpointer user_data) {
+  doUpdate = gtk_toggle_button_get_active(togglebutton);
+}
+
+void on_entUser_changed (GtkEditable * editable,
+                        gpointer user_data) {
+  struct symbol *sym;
+  gchar * ret;
+
+  sym = sym_lookup("USER", "GNUNETD", 0);
+  ret = gtk_editable_get_chars(editable, 0, -1);
+  GNUNET_ASSERT(ret != NULL);
+  sym_set_string_value(sym, ret);
+  FREENONNULL(user_name);
+  if (strlen(ret) != 0)
+    user_name = STRDUP(ret);
+  else
+    user_name = NULL;
+  g_free(ret);
+  
+}
+
+void on_entGroup_changed (GtkEditable * editable,
+                         gpointer user_data) {
+  struct symbol *sym;
+  gchar * ret;
+
+  FREENONNULL(group_name);
+  ret = gtk_editable_get_chars(editable, 0, -1);
+  GNUNET_ASSERT(ret != NULL);
+  sym_set_string_value(sym, ret);
+  if (strlen(ret) != 0)
+    group_name = STRDUP(ret);
+  else
+    group_name = NULL;
+  sym = sym_lookup("GROUP", "GNUNETD", 0);
+  g_free(ret);
+}
+
+
+int gtk_wizard_main(int argc, 
+                   char **argv,
+                   void * lib) {
+  struct symbol * sym;
+  char * filename;
+  GladeXML * mainXML;
+       
+  library = lib;
+  gtk_init(&argc, &argv); 
+#ifdef ENABLE_NLS
+  /* GTK uses UTF-8 encoding */
+  bind_textdomain_codeset(PACKAGE, "UTF-8");
+#endif
+#ifdef WINDOWS
+  FreeConsole();
+#endif
+  gtk_set_locale ();
+  filename = getConfigurationString("GNUNET-SETUP",
+                                  "FILENAME");
+  conf_read(filename);
+  FREE(filename);
+  sym = sym_find("EXPERIMENTAL", "Meta");
+  sym_set_tristate_value(sym, yes);
+  sym = sym_find("ADVANCED", "Meta");
+  sym_set_tristate_value(sym, yes);
+  sym = sym_find("RARE", "Meta");
+  sym_set_tristate_value(sym, yes);
+  curwnd = get_xml("assi_step1");
+  gtk_widget_show(curwnd);
+  gdk_threads_enter();
+  gtk_main();
+  gdk_threads_leave();
+  GNUNET_ASSERT(mainXML != NULL);
+  g_object_unref(mainXML);
+  mainXML = NULL;
+  if (doOpenEnhConfigurator)
+    gconf_main(argc, argv);
+  FREENONNULL(user_name);
+  FREENONNULL(group_name);
+  library = NULL;
+  return 0;
+}

Copied: GNUnet/src/conf/wizard_gtk.h (from rev 2802, GNUnet/src/conf/wizard.h)
===================================================================
--- GNUnet/src/conf/wizard.h    2006-05-14 02:04:44 UTC (rev 2802)
+++ GNUnet/src/conf/wizard_gtk.h        2006-05-14 08:39:13 UTC (rev 2804)
@@ -0,0 +1,35 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001, 2002, 2005 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
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+
+/**
+ * @file conf/wizard_gtk.h
+ * @brief GNUnet Setup
+ * @author Nils Durner
+ */
+
+#ifndef WIZARD_GTK_H
+#define WIZARD_GTK_H
+
+int gtk_wizard_main(int argc, 
+                   char **argv,
+                   void * library);
+
+#endif

Deleted: GNUnet/src/conf/wizard_interface.c
===================================================================
--- GNUnet/src/conf/wizard_interface.c  2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard_interface.c  2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,1423 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include "wizard_callbacks.h"
-#include "wizard_interface.h"
-#include "wizard_support.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
-  g_object_set_data_full (G_OBJECT (component), name, \
-    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
-
-#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
-  g_object_set_data (G_OBJECT (component), name, widget)
-
-GtkWidget*
-create_assi_step1 (void)
-{
-  GtkWidget *assi_step1;
-  GtkWidget *vbox2;
-  GtkWidget *scoll_welcome;
-  GtkWidget *textview11;
-  GtkWidget *hseparator2;
-  GtkWidget *hbuttonbox1;
-  GtkWidget *step1_next;
-  GtkWidget *alignment31;
-  GtkWidget *hbox54;
-  GtkWidget *image64;
-  GtkWidget *label85;
-  GtkWidget *abort;
-  GtkWidget *alignment32;
-  GtkWidget *hbox55;
-  GtkWidget *image65;
-  GtkWidget *label86;
-
-  assi_step1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (assi_step1, 450, 350);
-  gtk_window_set_title (GTK_WINDOW (assi_step1), _("GNUnet configuration 
assistant"));
-  gtk_window_set_position (GTK_WINDOW (assi_step1), GTK_WIN_POS_CENTER);
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox2);
-  gtk_container_add (GTK_CONTAINER (assi_step1), vbox2);
-
-  scoll_welcome = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scoll_welcome);
-  gtk_box_pack_start (GTK_BOX (vbox2), scoll_welcome, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scoll_welcome), 
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-  textview11 = gtk_text_view_new ();
-  gtk_widget_show (textview11);
-  gtk_container_add (GTK_CONTAINER (scoll_welcome), textview11);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview11), FALSE);
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview11), GTK_WRAP_WORD);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview11), FALSE);
-  gtk_text_view_set_indent (GTK_TEXT_VIEW (textview11), 2);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW 
(textview11)), _("Welcome to GNUnet!\n\nThis assistant will ask you a few basic 
questions in order to configure GNUnet.\n\nPlease visit our homepage 
at\n\thttp://gnunet.org\nand join our community 
at\n\thttps://gnunet.org/drupal/\n\nHave a lot of fun,\n\nthe GNUnet team"), 
-1);
-
-  hseparator2 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator2);
-  gtk_box_pack_start (GTK_BOX (vbox2), hseparator2, FALSE, TRUE, 0);
-
-  hbuttonbox1 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox1);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox1, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END);
-
-  step1_next = gtk_button_new ();
-  gtk_widget_show (step1_next);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), step1_next);
-  GTK_WIDGET_SET_FLAGS (step1_next, GTK_CAN_DEFAULT);
-
-  alignment31 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment31);
-  gtk_container_add (GTK_CONTAINER (step1_next), alignment31);
-
-  hbox54 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox54);
-  gtk_container_add (GTK_CONTAINER (alignment31), hbox54);
-
-  image64 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image64);
-  gtk_box_pack_start (GTK_BOX (hbox54), image64, FALSE, FALSE, 0);
-
-  label85 = gtk_label_new_with_mnemonic (_("Next"));
-  gtk_widget_show (label85);
-  gtk_box_pack_start (GTK_BOX (hbox54), label85, FALSE, FALSE, 0);
-
-  abort = gtk_button_new ();
-  gtk_widget_show (abort);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), abort);
-  GTK_WIDGET_SET_FLAGS (abort, GTK_CAN_DEFAULT);
-
-  alignment32 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment32);
-  gtk_container_add (GTK_CONTAINER (abort), alignment32);
-
-  hbox55 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox55);
-  gtk_container_add (GTK_CONTAINER (alignment32), hbox55);
-
-  image65 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image65);
-  gtk_box_pack_start (GTK_BOX (hbox55), image65, FALSE, FALSE, 0);
-
-  label86 = gtk_label_new_with_mnemonic (_("Cancel"));
-  gtk_widget_show (label86);
-  gtk_box_pack_start (GTK_BOX (hbox55), label86, FALSE, FALSE, 0);
-
-  g_signal_connect ((gpointer) assi_step1, "destroy",
-                    G_CALLBACK (on_assi_destroy),
-                    NULL);
-  g_signal_connect ((gpointer) step1_next, "clicked",
-                    G_CALLBACK (on_step1_next_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) abort, "clicked",
-                    G_CALLBACK (on_abort_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (assi_step1, assi_step1, "assi_step1");
-  GLADE_HOOKUP_OBJECT (assi_step1, vbox2, "vbox2");
-  GLADE_HOOKUP_OBJECT (assi_step1, scoll_welcome, "scoll_welcome");
-  GLADE_HOOKUP_OBJECT (assi_step1, textview11, "textview11");
-  GLADE_HOOKUP_OBJECT (assi_step1, hseparator2, "hseparator2");
-  GLADE_HOOKUP_OBJECT (assi_step1, hbuttonbox1, "hbuttonbox1");
-  GLADE_HOOKUP_OBJECT (assi_step1, step1_next, "step1_next");
-  GLADE_HOOKUP_OBJECT (assi_step1, alignment31, "alignment31");
-  GLADE_HOOKUP_OBJECT (assi_step1, hbox54, "hbox54");
-  GLADE_HOOKUP_OBJECT (assi_step1, image64, "image64");
-  GLADE_HOOKUP_OBJECT (assi_step1, label85, "label85");
-  GLADE_HOOKUP_OBJECT (assi_step1, abort, "abort");
-  GLADE_HOOKUP_OBJECT (assi_step1, alignment32, "alignment32");
-  GLADE_HOOKUP_OBJECT (assi_step1, hbox55, "hbox55");
-  GLADE_HOOKUP_OBJECT (assi_step1, image65, "image65");
-  GLADE_HOOKUP_OBJECT (assi_step1, label86, "label86");
-
-  return assi_step1;
-}
-
-GtkWidget*
-create_assi_step2 (void)
-{
-  GtkWidget *assi_step2;
-  GtkWidget *vbox3;
-  GtkWidget *frame1;
-  GtkWidget *vbox4;
-  GtkWidget *scrolledwindow5;
-  GtkWidget *textview8;
-  GtkWidget *hseparator3;
-  GtkWidget *vbox5;
-  GtkWidget *vbox6;
-  GtkWidget *table1;
-  GtkWidget *label23;
-  GtkWidget *label24;
-  GtkWidget *entIP;
-  GtkWidget *chkFW;
-  GtkWidget *cmbNIC;
-  GtkWidget *labelLimit;
-  GtkWidget *hbuttonbox2;
-  GtkWidget *step2_back;
-  GtkWidget *alignment33;
-  GtkWidget *hbox56;
-  GtkWidget *image66;
-  GtkWidget *label87;
-  GtkWidget *step2_next;
-  GtkWidget *alignment41;
-  GtkWidget *hbox64;
-  GtkWidget *image74;
-  GtkWidget *label95;
-  GtkWidget *step2_abort;
-  GtkWidget *alignment42;
-  GtkWidget *hbox68;
-  GtkWidget *image78;
-  GtkWidget *label99;
-
-  assi_step2 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (assi_step2, 450, 350);
-  gtk_window_set_title (GTK_WINDOW (assi_step2), _("GNUnet configuration 
assistant"));
-  gtk_window_set_position (GTK_WINDOW (assi_step2), GTK_WIN_POS_CENTER);
-
-  vbox3 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox3);
-  gtk_container_add (GTK_CONTAINER (assi_step2), vbox3);
-
-  frame1 = gtk_frame_new (NULL);
-  gtk_widget_show (frame1);
-  gtk_box_pack_start (GTK_BOX (vbox3), frame1, TRUE, TRUE, 0);
-
-  vbox4 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox4);
-  gtk_container_add (GTK_CONTAINER (frame1), vbox4);
-
-  scrolledwindow5 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow5);
-  gtk_box_pack_start (GTK_BOX (vbox4), scrolledwindow5, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow5), 
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-  textview8 = gtk_text_view_new ();
-  gtk_widget_show (textview8);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow5), textview8);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview8), FALSE);
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview8), GTK_WRAP_WORD);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview8), FALSE);
-  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textview8), 2);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW 
(textview8)), _("Enter information about your network connection here.\n\nThe 
\"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.\n\nIf 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.\nIf in doubt, leave the field empty. GNUnet will then 
try to determine your IP-Address.\n\nIf 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\")."), -1);
-
-  hseparator3 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator3);
-  gtk_box_pack_start (GTK_BOX (vbox4), hseparator3, FALSE, FALSE, 0);
-
-  vbox5 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox5);
-  gtk_box_pack_start (GTK_BOX (vbox4), vbox5, TRUE, TRUE, 0);
-
-  vbox6 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox6);
-  gtk_box_pack_start (GTK_BOX (vbox5), vbox6, TRUE, TRUE, 0);
-
-  table1 = gtk_table_new (3, 2, FALSE);
-  gtk_widget_show (table1);
-  gtk_box_pack_start (GTK_BOX (vbox6), table1, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (table1), 5);
-  gtk_table_set_row_spacings (GTK_TABLE (table1), 5);
-  gtk_table_set_col_spacings (GTK_TABLE (table1), 5);
-
-  label23 = gtk_label_new (_("Network interface:"));
-  gtk_widget_show (label23);
-  gtk_table_attach (GTK_TABLE (table1), label23, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label23), 0, 0.5);
-
-  label24 = gtk_label_new (_("IP-Address/Hostname:"));
-  gtk_widget_show (label24);
-  gtk_table_attach (GTK_TABLE (table1), label24, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label24), 0, 0.5);
-
-  entIP = gtk_entry_new ();
-  gtk_widget_show (entIP);
-  gtk_table_attach (GTK_TABLE (table1), entIP, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  chkFW = gtk_check_button_new_with_mnemonic (_("Computer cannot receive 
inbound connections (SNAT/Firewall)"));
-  gtk_widget_show (chkFW);
-  gtk_table_attach (GTK_TABLE (table1), chkFW, 0, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  cmbNIC = gtk_combo_box_entry_new_text ();
-  gtk_widget_show (cmbNIC);
-  gtk_table_attach (GTK_TABLE (table1), cmbNIC, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-  labelLimit = gtk_label_new (_("Network connection"));
-  gtk_widget_show (labelLimit);
-  gtk_frame_set_label_widget (GTK_FRAME (frame1), labelLimit);
-
-  hbuttonbox2 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox2);
-  gtk_box_pack_start (GTK_BOX (vbox3), hbuttonbox2, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_END);
-
-  step2_back = gtk_button_new ();
-  gtk_widget_show (step2_back);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox2), step2_back);
-  GTK_WIDGET_SET_FLAGS (step2_back, GTK_CAN_DEFAULT);
-
-  alignment33 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment33);
-  gtk_container_add (GTK_CONTAINER (step2_back), alignment33);
-
-  hbox56 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox56);
-  gtk_container_add (GTK_CONTAINER (alignment33), hbox56);
-
-  image66 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image66);
-  gtk_box_pack_start (GTK_BOX (hbox56), image66, FALSE, FALSE, 0);
-
-  label87 = gtk_label_new_with_mnemonic (_("Back"));
-  gtk_widget_show (label87);
-  gtk_box_pack_start (GTK_BOX (hbox56), label87, FALSE, FALSE, 0);
-
-  step2_next = gtk_button_new ();
-  gtk_widget_show (step2_next);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox2), step2_next);
-  GTK_WIDGET_SET_FLAGS (step2_next, GTK_CAN_DEFAULT);
-
-  alignment41 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment41);
-  gtk_container_add (GTK_CONTAINER (step2_next), alignment41);
-
-  hbox64 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox64);
-  gtk_container_add (GTK_CONTAINER (alignment41), hbox64);
-
-  image74 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image74);
-  gtk_box_pack_start (GTK_BOX (hbox64), image74, FALSE, FALSE, 0);
-
-  label95 = gtk_label_new_with_mnemonic (_("Next"));
-  gtk_widget_show (label95);
-  gtk_box_pack_start (GTK_BOX (hbox64), label95, FALSE, FALSE, 0);
-
-  step2_abort = gtk_button_new ();
-  gtk_widget_show (step2_abort);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox2), step2_abort);
-  GTK_WIDGET_SET_FLAGS (step2_abort, GTK_CAN_DEFAULT);
-
-  alignment42 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment42);
-  gtk_container_add (GTK_CONTAINER (step2_abort), alignment42);
-
-  hbox68 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox68);
-  gtk_container_add (GTK_CONTAINER (alignment42), hbox68);
-
-  image78 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image78);
-  gtk_box_pack_start (GTK_BOX (hbox68), image78, FALSE, FALSE, 0);
-
-  label99 = gtk_label_new_with_mnemonic (_("Cancel"));
-  gtk_widget_show (label99);
-  gtk_box_pack_start (GTK_BOX (hbox68), label99, FALSE, FALSE, 0);
-
-  g_signal_connect ((gpointer) assi_step2, "destroy",
-                    G_CALLBACK (on_assi_destroy),
-                    NULL);
-  g_signal_connect ((gpointer) entIP, "changed",
-                    G_CALLBACK (on_entIP_changed),
-                    NULL);
-  g_signal_connect ((gpointer) chkFW, "toggled",
-                    G_CALLBACK (on_chkFW_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) cmbNIC, "changed",
-                    G_CALLBACK (on_cmbNIC_changed),
-                    NULL);
-  g_signal_connect ((gpointer) step2_back, "clicked",
-                    G_CALLBACK (on_step2_back_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step2_next, "clicked",
-                    G_CALLBACK (on_step2_next_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step2_abort, "clicked",
-                    G_CALLBACK (on_abort_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (assi_step2, assi_step2, "assi_step2");
-  GLADE_HOOKUP_OBJECT (assi_step2, vbox3, "vbox3");
-  GLADE_HOOKUP_OBJECT (assi_step2, frame1, "frame1");
-  GLADE_HOOKUP_OBJECT (assi_step2, vbox4, "vbox4");
-  GLADE_HOOKUP_OBJECT (assi_step2, scrolledwindow5, "scrolledwindow5");
-  GLADE_HOOKUP_OBJECT (assi_step2, textview8, "textview8");
-  GLADE_HOOKUP_OBJECT (assi_step2, hseparator3, "hseparator3");
-  GLADE_HOOKUP_OBJECT (assi_step2, vbox5, "vbox5");
-  GLADE_HOOKUP_OBJECT (assi_step2, vbox6, "vbox6");
-  GLADE_HOOKUP_OBJECT (assi_step2, table1, "table1");
-  GLADE_HOOKUP_OBJECT (assi_step2, label23, "label23");
-  GLADE_HOOKUP_OBJECT (assi_step2, label24, "label24");
-  GLADE_HOOKUP_OBJECT (assi_step2, entIP, "entIP");
-  GLADE_HOOKUP_OBJECT (assi_step2, chkFW, "chkFW");
-  GLADE_HOOKUP_OBJECT (assi_step2, cmbNIC, "cmbNIC");
-  GLADE_HOOKUP_OBJECT (assi_step2, labelLimit, "labelLimit");
-  GLADE_HOOKUP_OBJECT (assi_step2, hbuttonbox2, "hbuttonbox2");
-  GLADE_HOOKUP_OBJECT (assi_step2, step2_back, "step2_back");
-  GLADE_HOOKUP_OBJECT (assi_step2, alignment33, "alignment33");
-  GLADE_HOOKUP_OBJECT (assi_step2, hbox56, "hbox56");
-  GLADE_HOOKUP_OBJECT (assi_step2, image66, "image66");
-  GLADE_HOOKUP_OBJECT (assi_step2, label87, "label87");
-  GLADE_HOOKUP_OBJECT (assi_step2, step2_next, "step2_next");
-  GLADE_HOOKUP_OBJECT (assi_step2, alignment41, "alignment41");
-  GLADE_HOOKUP_OBJECT (assi_step2, hbox64, "hbox64");
-  GLADE_HOOKUP_OBJECT (assi_step2, image74, "image74");
-  GLADE_HOOKUP_OBJECT (assi_step2, label95, "label95");
-  GLADE_HOOKUP_OBJECT (assi_step2, step2_abort, "step2_abort");
-  GLADE_HOOKUP_OBJECT (assi_step2, alignment42, "alignment42");
-  GLADE_HOOKUP_OBJECT (assi_step2, hbox68, "hbox68");
-  GLADE_HOOKUP_OBJECT (assi_step2, image78, "image78");
-  GLADE_HOOKUP_OBJECT (assi_step2, label99, "label99");
-
-  return assi_step2;
-}
-
-GtkWidget*
-create_assi_step3 (void)
-{
-  GtkWidget *assi_step3;
-  GtkWidget *vbox7;
-  GtkWidget *frame3;
-  GtkWidget *vbox8;
-  GtkWidget *scrolledwindow6;
-  GtkWidget *textview9;
-  GtkWidget *hseparator4;
-  GtkWidget *vbox9;
-  GtkWidget *vbox10;
-  GtkWidget *frame4;
-  GtkWidget *hbox24;
-  GtkWidget *table2;
-  GtkWidget *label32;
-  GtkWidget *entUp;
-  GtkWidget *label33;
-  GtkWidget *entDown;
-  GtkWidget *label31;
-  GtkWidget *frame5;
-  GtkWidget *vbox11;
-  GtkWidget *radGNUnet;
-  GSList *radGNUnet_group = NULL;
-  GtkWidget *radShare;
-  GtkWidget *label34;
-  GtkWidget *frame6;
-  GtkWidget *hbox25;
-  GtkWidget *label36;
-  GtkWidget *entCPU;
-  GtkWidget *label35;
-  GtkWidget *label27;
-  GtkWidget *hbuttonbox4;
-  GtkWidget *step3_back;
-  GtkWidget *alignment34;
-  GtkWidget *hbox57;
-  GtkWidget *image67;
-  GtkWidget *label88;
-  GtkWidget *step3_next;
-  GtkWidget *alignment35;
-  GtkWidget *hbox58;
-  GtkWidget *image68;
-  GtkWidget *label89;
-  GtkWidget *step3_abort;
-  GtkWidget *alignment36;
-  GtkWidget *hbox59;
-  GtkWidget *image69;
-  GtkWidget *label90;
-
-  assi_step3 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (assi_step3, 450, 350);
-  gtk_window_set_title (GTK_WINDOW (assi_step3), _("GNUnet configuration 
assistant"));
-  gtk_window_set_position (GTK_WINDOW (assi_step3), GTK_WIN_POS_CENTER);
-
-  vbox7 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox7);
-  gtk_container_add (GTK_CONTAINER (assi_step3), vbox7);
-
-  frame3 = gtk_frame_new (NULL);
-  gtk_widget_show (frame3);
-  gtk_box_pack_start (GTK_BOX (vbox7), frame3, TRUE, TRUE, 0);
-
-  vbox8 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox8);
-  gtk_container_add (GTK_CONTAINER (frame3), vbox8);
-
-  scrolledwindow6 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow6);
-  gtk_box_pack_start (GTK_BOX (vbox8), scrolledwindow6, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow6), 
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-  textview9 = gtk_text_view_new ();
-  gtk_widget_show (textview9);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow6), textview9);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview9), FALSE);
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview9), GTK_WRAP_WORD);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview9), FALSE);
-  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textview9), 2);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW 
(textview9)), _("You can limit GNUnet's ressource usage here.\n\n\"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.\n\nThe \"Max. 
CPU usage\" is the percentage of processor time GNUnet is allowed to use."), 
-1);
-
-  hseparator4 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator4);
-  gtk_box_pack_start (GTK_BOX (vbox8), hseparator4, FALSE, TRUE, 0);
-
-  vbox9 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox9);
-  gtk_box_pack_start (GTK_BOX (vbox8), vbox9, TRUE, TRUE, 0);
-
-  vbox10 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox10);
-  gtk_box_pack_start (GTK_BOX (vbox9), vbox10, TRUE, TRUE, 0);
-
-  frame4 = gtk_frame_new (NULL);
-  gtk_widget_show (frame4);
-  gtk_box_pack_start (GTK_BOX (vbox10), frame4, TRUE, TRUE, 0);
-
-  hbox24 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox24);
-  gtk_container_add (GTK_CONTAINER (frame4), hbox24);
-
-  table2 = gtk_table_new (2, 2, FALSE);
-  gtk_widget_show (table2);
-  gtk_box_pack_start (GTK_BOX (hbox24), table2, TRUE, TRUE, 0);
-  gtk_table_set_row_spacings (GTK_TABLE (table2), 5);
-  gtk_table_set_col_spacings (GTK_TABLE (table2), 5);
-
-  label32 = gtk_label_new (_("Upstream (Bytes/s):"));
-  gtk_widget_show (label32);
-  gtk_table_attach (GTK_TABLE (table2), label32, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label32), 0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (label32), 5, 0);
-
-  entUp = gtk_entry_new ();
-  gtk_widget_show (entUp);
-  gtk_table_attach (GTK_TABLE (table2), entUp, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label33 = gtk_label_new (_("Downstream (Bytes/s):"));
-  gtk_widget_show (label33);
-  gtk_table_attach (GTK_TABLE (table2), label33, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label33), 0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (label33), 5, 0);
-
-  entDown = gtk_entry_new ();
-  gtk_widget_show (entDown);
-  gtk_table_attach (GTK_TABLE (table2), entDown, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label31 = gtk_label_new (_("Bandwidth limitation"));
-  gtk_widget_show (label31);
-  gtk_frame_set_label_widget (GTK_FRAME (frame4), label31);
-
-  frame5 = gtk_frame_new (NULL);
-  gtk_widget_show (frame5);
-  gtk_box_pack_start (GTK_BOX (vbox10), frame5, TRUE, TRUE, 0);
-
-  vbox11 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox11);
-  gtk_container_add (GTK_CONTAINER (frame5), vbox11);
-
-  radGNUnet = gtk_radio_button_new_with_mnemonic (NULL, _("Use denoted 
bandwidth for GNUnet"));
-  gtk_widget_show (radGNUnet);
-  gtk_box_pack_start (GTK_BOX (vbox11), radGNUnet, FALSE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radGNUnet), radGNUnet_group);
-  radGNUnet_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radGNUnet));
-
-  radShare = gtk_radio_button_new_with_mnemonic (NULL, _("Share denoted 
bandwidth with other applications"));
-  gtk_widget_show (radShare);
-  gtk_box_pack_start (GTK_BOX (vbox11), radShare, FALSE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radShare), radGNUnet_group);
-  radGNUnet_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radShare));
-
-  label34 = gtk_label_new (_("Bandwidth sharing"));
-  gtk_widget_show (label34);
-  gtk_frame_set_label_widget (GTK_FRAME (frame5), label34);
-
-  frame6 = gtk_frame_new (NULL);
-  gtk_widget_show (frame6);
-  gtk_box_pack_start (GTK_BOX (vbox10), frame6, TRUE, TRUE, 0);
-
-  hbox25 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox25);
-  gtk_container_add (GTK_CONTAINER (frame6), hbox25);
-
-  label36 = gtk_label_new (_("Max. CPU usage (%):"));
-  gtk_widget_show (label36);
-  gtk_box_pack_start (GTK_BOX (hbox25), label36, FALSE, FALSE, 0);
-  gtk_misc_set_padding (GTK_MISC (label36), 5, 0);
-
-  entCPU = gtk_entry_new ();
-  gtk_widget_show (entCPU);
-  gtk_box_pack_start (GTK_BOX (hbox25), entCPU, TRUE, TRUE, 0);
-
-  label35 = gtk_label_new (_("CPU usage"));
-  gtk_widget_show (label35);
-  gtk_frame_set_label_widget (GTK_FRAME (frame6), label35);
-
-  label27 = gtk_label_new (_("Load limitation"));
-  gtk_widget_show (label27);
-  gtk_frame_set_label_widget (GTK_FRAME (frame3), label27);
-
-  hbuttonbox4 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox4);
-  gtk_box_pack_start (GTK_BOX (vbox7), hbuttonbox4, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox4), GTK_BUTTONBOX_END);
-
-  step3_back = gtk_button_new ();
-  gtk_widget_show (step3_back);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox4), step3_back);
-  GTK_WIDGET_SET_FLAGS (step3_back, GTK_CAN_DEFAULT);
-
-  alignment34 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment34);
-  gtk_container_add (GTK_CONTAINER (step3_back), alignment34);
-
-  hbox57 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox57);
-  gtk_container_add (GTK_CONTAINER (alignment34), hbox57);
-
-  image67 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image67);
-  gtk_box_pack_start (GTK_BOX (hbox57), image67, FALSE, FALSE, 0);
-
-  label88 = gtk_label_new_with_mnemonic (_("Back"));
-  gtk_widget_show (label88);
-  gtk_box_pack_start (GTK_BOX (hbox57), label88, FALSE, FALSE, 0);
-
-  step3_next = gtk_button_new ();
-  gtk_widget_show (step3_next);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox4), step3_next);
-  GTK_WIDGET_SET_FLAGS (step3_next, GTK_CAN_DEFAULT);
-
-  alignment35 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment35);
-  gtk_container_add (GTK_CONTAINER (step3_next), alignment35);
-
-  hbox58 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox58);
-  gtk_container_add (GTK_CONTAINER (alignment35), hbox58);
-
-  image68 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image68);
-  gtk_box_pack_start (GTK_BOX (hbox58), image68, FALSE, FALSE, 0);
-
-  label89 = gtk_label_new_with_mnemonic (_("Next"));
-  gtk_widget_show (label89);
-  gtk_box_pack_start (GTK_BOX (hbox58), label89, FALSE, FALSE, 0);
-
-  step3_abort = gtk_button_new ();
-  gtk_widget_show (step3_abort);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox4), step3_abort);
-  GTK_WIDGET_SET_FLAGS (step3_abort, GTK_CAN_DEFAULT);
-
-  alignment36 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment36);
-  gtk_container_add (GTK_CONTAINER (step3_abort), alignment36);
-
-  hbox59 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox59);
-  gtk_container_add (GTK_CONTAINER (alignment36), hbox59);
-
-  image69 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image69);
-  gtk_box_pack_start (GTK_BOX (hbox59), image69, FALSE, FALSE, 0);
-
-  label90 = gtk_label_new_with_mnemonic (_("Cancel"));
-  gtk_widget_show (label90);
-  gtk_box_pack_start (GTK_BOX (hbox59), label90, FALSE, FALSE, 0);
-
-  g_signal_connect ((gpointer) assi_step3, "destroy",
-                    G_CALLBACK (on_assi_destroy),
-                    NULL);
-  g_signal_connect ((gpointer) entUp, "changed",
-                    G_CALLBACK (on_entUp_changed),
-                    NULL);
-  g_signal_connect ((gpointer) entDown, "changed",
-                    G_CALLBACK (on_entDown_changed),
-                    NULL);
-  g_signal_connect ((gpointer) radGNUnet, "toggled",
-                    G_CALLBACK (on_radGNUnet_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) radShare, "toggled",
-                    G_CALLBACK (on_radShare_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) entCPU, "changed",
-                    G_CALLBACK (on_entCPU_changed),
-                    NULL);
-  g_signal_connect ((gpointer) step3_back, "clicked",
-                    G_CALLBACK (on_step3_back_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step3_next, "clicked",
-                    G_CALLBACK (on_step3_next_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step3_abort, "clicked",
-                    G_CALLBACK (on_abort_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (assi_step3, assi_step3, "assi_step3");
-  GLADE_HOOKUP_OBJECT (assi_step3, vbox7, "vbox7");
-  GLADE_HOOKUP_OBJECT (assi_step3, frame3, "frame3");
-  GLADE_HOOKUP_OBJECT (assi_step3, vbox8, "vbox8");
-  GLADE_HOOKUP_OBJECT (assi_step3, scrolledwindow6, "scrolledwindow6");
-  GLADE_HOOKUP_OBJECT (assi_step3, textview9, "textview9");
-  GLADE_HOOKUP_OBJECT (assi_step3, hseparator4, "hseparator4");
-  GLADE_HOOKUP_OBJECT (assi_step3, vbox9, "vbox9");
-  GLADE_HOOKUP_OBJECT (assi_step3, vbox10, "vbox10");
-  GLADE_HOOKUP_OBJECT (assi_step3, frame4, "frame4");
-  GLADE_HOOKUP_OBJECT (assi_step3, hbox24, "hbox24");
-  GLADE_HOOKUP_OBJECT (assi_step3, table2, "table2");
-  GLADE_HOOKUP_OBJECT (assi_step3, label32, "label32");
-  GLADE_HOOKUP_OBJECT (assi_step3, entUp, "entUp");
-  GLADE_HOOKUP_OBJECT (assi_step3, label33, "label33");
-  GLADE_HOOKUP_OBJECT (assi_step3, entDown, "entDown");
-  GLADE_HOOKUP_OBJECT (assi_step3, label31, "label31");
-  GLADE_HOOKUP_OBJECT (assi_step3, frame5, "frame5");
-  GLADE_HOOKUP_OBJECT (assi_step3, vbox11, "vbox11");
-  GLADE_HOOKUP_OBJECT (assi_step3, radGNUnet, "radGNUnet");
-  GLADE_HOOKUP_OBJECT (assi_step3, radShare, "radShare");
-  GLADE_HOOKUP_OBJECT (assi_step3, label34, "label34");
-  GLADE_HOOKUP_OBJECT (assi_step3, frame6, "frame6");
-  GLADE_HOOKUP_OBJECT (assi_step3, hbox25, "hbox25");
-  GLADE_HOOKUP_OBJECT (assi_step3, label36, "label36");
-  GLADE_HOOKUP_OBJECT (assi_step3, entCPU, "entCPU");
-  GLADE_HOOKUP_OBJECT (assi_step3, label35, "label35");
-  GLADE_HOOKUP_OBJECT (assi_step3, label27, "label27");
-  GLADE_HOOKUP_OBJECT (assi_step3, hbuttonbox4, "hbuttonbox4");
-  GLADE_HOOKUP_OBJECT (assi_step3, step3_back, "step3_back");
-  GLADE_HOOKUP_OBJECT (assi_step3, alignment34, "alignment34");
-  GLADE_HOOKUP_OBJECT (assi_step3, hbox57, "hbox57");
-  GLADE_HOOKUP_OBJECT (assi_step3, image67, "image67");
-  GLADE_HOOKUP_OBJECT (assi_step3, label88, "label88");
-  GLADE_HOOKUP_OBJECT (assi_step3, step3_next, "step3_next");
-  GLADE_HOOKUP_OBJECT (assi_step3, alignment35, "alignment35");
-  GLADE_HOOKUP_OBJECT (assi_step3, hbox58, "hbox58");
-  GLADE_HOOKUP_OBJECT (assi_step3, image68, "image68");
-  GLADE_HOOKUP_OBJECT (assi_step3, label89, "label89");
-  GLADE_HOOKUP_OBJECT (assi_step3, step3_abort, "step3_abort");
-  GLADE_HOOKUP_OBJECT (assi_step3, alignment36, "alignment36");
-  GLADE_HOOKUP_OBJECT (assi_step3, hbox59, "hbox59");
-  GLADE_HOOKUP_OBJECT (assi_step3, image69, "image69");
-  GLADE_HOOKUP_OBJECT (assi_step3, label90, "label90");
-
-  return assi_step3;
-}
-
-GtkWidget*
-create_assi_step5 (void)
-{
-  GtkWidget *assi_step5;
-  GtkWidget *vbox12;
-  GtkWidget *frame7;
-  GtkWidget *vbox13;
-  GtkWidget *scrolledwindow7;
-  GtkWidget *textview10;
-  GtkWidget *hseparator5;
-  GtkWidget *vbox14;
-  GtkWidget *vbox15;
-  GtkWidget *chkMigr;
-  GtkWidget *hbox53;
-  GtkWidget *label84;
-  GtkWidget *entQuota;
-  GtkWidget *chkStart;
-  GtkWidget *chkEnh;
-  GtkWidget *chkUpdate;
-  GtkWidget *label43;
-  GtkWidget *hbuttonbox5;
-  GtkWidget *step5_back;
-  GtkWidget *alignment37;
-  GtkWidget *hbox60;
-  GtkWidget *image70;
-  GtkWidget *label91;
-  GtkWidget *step5_next;
-  GtkWidget *alignment40;
-  GtkWidget *hbox63;
-  GtkWidget *image73;
-  GtkWidget *label94;
-  GtkWidget *step5_cancel;
-  GtkWidget *alignment39;
-  GtkWidget *hbox62;
-  GtkWidget *image72;
-  GtkWidget *label93;
-
-  assi_step5 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (assi_step5, 450, 350);
-  gtk_window_set_title (GTK_WINDOW (assi_step5), _("GNUnet configuration 
assistant"));
-  gtk_window_set_position (GTK_WINDOW (assi_step5), GTK_WIN_POS_CENTER);
-
-  vbox12 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox12);
-  gtk_container_add (GTK_CONTAINER (assi_step5), vbox12);
-
-  frame7 = gtk_frame_new (NULL);
-  gtk_widget_show (frame7);
-  gtk_box_pack_start (GTK_BOX (vbox12), frame7, TRUE, TRUE, 0);
-
-  vbox13 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox13);
-  gtk_container_add (GTK_CONTAINER (frame7), vbox13);
-
-  scrolledwindow7 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow7);
-  gtk_box_pack_start (GTK_BOX (vbox13), scrolledwindow7, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow7), 
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-  textview10 = gtk_text_view_new ();
-  gtk_widget_show (textview10);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow7), textview10);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview10), FALSE);
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview10), GTK_WRAP_WORD);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview10), FALSE);
-  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textview10), 2);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW 
(textview10)), _("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.\nIt also helps to spread popular content over different peers to 
enhance availability.\n\nThe GNUnet datastore contains all data that GNUnet 
generates (index data, inserted and migrated content). Its maximum size can be 
specified below.\n\nIf you are an experienced user, you may want to tweak your 
GNUnet installation using the enhanced configurator.\n\nAfter 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."), -1);
-
-  hseparator5 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator5);
-  gtk_box_pack_start (GTK_BOX (vbox13), hseparator5, FALSE, FALSE, 0);
-
-  vbox14 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox14);
-  gtk_box_pack_start (GTK_BOX (vbox13), vbox14, TRUE, TRUE, 0);
-
-  vbox15 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox15);
-  gtk_box_pack_start (GTK_BOX (vbox14), vbox15, TRUE, TRUE, 0);
-
-  chkMigr = gtk_check_button_new_with_mnemonic (_("Store migrated content"));
-  gtk_widget_show (chkMigr);
-  gtk_box_pack_start (GTK_BOX (vbox15), chkMigr, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (chkMigr), 4);
-
-  hbox53 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox53);
-  gtk_box_pack_start (GTK_BOX (vbox15), hbox53, TRUE, TRUE, 0);
-
-  label84 = gtk_label_new (_("Maximum datastore size (MB):"));
-  gtk_widget_show (label84);
-  gtk_box_pack_start (GTK_BOX (hbox53), label84, FALSE, FALSE, 0);
-  gtk_misc_set_padding (GTK_MISC (label84), 8, 0);
-
-  entQuota = gtk_entry_new ();
-  gtk_widget_show (entQuota);
-  gtk_box_pack_start (GTK_BOX (hbox53), entQuota, TRUE, TRUE, 0);
-
-  chkStart = gtk_check_button_new_with_mnemonic (_("Start the GNUnet 
background process on computer startup"));
-  gtk_widget_show (chkStart);
-  gtk_box_pack_start (GTK_BOX (vbox15), chkStart, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (chkStart), 5);
-  gtk_widget_set_sensitive (chkStart, FALSE);
-
-  chkEnh = gtk_check_button_new_with_mnemonic (_("Open the enhanced 
configurator"));
-  gtk_widget_show (chkEnh);
-  gtk_box_pack_start (GTK_BOX (vbox15), chkEnh, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (chkEnh), 5);
-
-  chkUpdate = gtk_check_button_new_with_mnemonic (_("Run gnunet-update"));
-  gtk_widget_show (chkUpdate);
-  gtk_box_pack_start (GTK_BOX (vbox15), chkUpdate, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (chkUpdate), 5);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkUpdate), TRUE);
-
-  label43 = gtk_label_new (_("Other settings"));
-  gtk_widget_show (label43);
-  gtk_frame_set_label_widget (GTK_FRAME (frame7), label43);
-
-  hbuttonbox5 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox5);
-  gtk_box_pack_start (GTK_BOX (vbox12), hbuttonbox5, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox5), GTK_BUTTONBOX_END);
-
-  step5_back = gtk_button_new ();
-  gtk_widget_show (step5_back);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox5), step5_back);
-  GTK_WIDGET_SET_FLAGS (step5_back, GTK_CAN_DEFAULT);
-
-  alignment37 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment37);
-  gtk_container_add (GTK_CONTAINER (step5_back), alignment37);
-
-  hbox60 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox60);
-  gtk_container_add (GTK_CONTAINER (alignment37), hbox60);
-
-  image70 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image70);
-  gtk_box_pack_start (GTK_BOX (hbox60), image70, FALSE, FALSE, 0);
-
-  label91 = gtk_label_new_with_mnemonic (_("Back"));
-  gtk_widget_show (label91);
-  gtk_box_pack_start (GTK_BOX (hbox60), label91, FALSE, FALSE, 0);
-
-  step5_next = gtk_button_new ();
-  gtk_widget_show (step5_next);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox5), step5_next);
-  GTK_WIDGET_SET_FLAGS (step5_next, GTK_CAN_DEFAULT);
-
-  alignment40 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment40);
-  gtk_container_add (GTK_CONTAINER (step5_next), alignment40);
-
-  hbox63 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox63);
-  gtk_container_add (GTK_CONTAINER (alignment40), hbox63);
-
-  image73 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image73);
-  gtk_box_pack_start (GTK_BOX (hbox63), image73, FALSE, FALSE, 0);
-
-  label94 = gtk_label_new_with_mnemonic (_("Finish"));
-  gtk_widget_show (label94);
-  gtk_box_pack_start (GTK_BOX (hbox63), label94, FALSE, FALSE, 0);
-
-  step5_cancel = gtk_button_new ();
-  gtk_widget_show (step5_cancel);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox5), step5_cancel);
-  GTK_WIDGET_SET_FLAGS (step5_cancel, GTK_CAN_DEFAULT);
-
-  alignment39 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment39);
-  gtk_container_add (GTK_CONTAINER (step5_cancel), alignment39);
-
-  hbox62 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox62);
-  gtk_container_add (GTK_CONTAINER (alignment39), hbox62);
-
-  image72 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image72);
-  gtk_box_pack_start (GTK_BOX (hbox62), image72, FALSE, FALSE, 0);
-
-  label93 = gtk_label_new_with_mnemonic (_("Cancel"));
-  gtk_widget_show (label93);
-  gtk_box_pack_start (GTK_BOX (hbox62), label93, FALSE, FALSE, 0);
-
-  g_signal_connect ((gpointer) assi_step5, "destroy",
-                    G_CALLBACK (on_assi_destroy),
-                    NULL);
-  g_signal_connect ((gpointer) chkMigr, "toggled",
-                    G_CALLBACK (on_chkMigr_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) entQuota, "changed",
-                    G_CALLBACK (on_entQuota_changed),
-                    NULL);
-  g_signal_connect ((gpointer) chkStart, "toggled",
-                    G_CALLBACK (on_chkStart_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) chkEnh, "toggled",
-                    G_CALLBACK (on_chkEnh_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) chkUpdate, "toggled",
-                    G_CALLBACK (on_chkUpdate_toggled),
-                    NULL);
-  g_signal_connect ((gpointer) step5_back, "clicked",
-                    G_CALLBACK (on_step5_back_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step5_next, "clicked",
-                    G_CALLBACK (on_finish_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step5_cancel, "clicked",
-                    G_CALLBACK (on_abort_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (assi_step5, assi_step5, "assi_step5");
-  GLADE_HOOKUP_OBJECT (assi_step5, vbox12, "vbox12");
-  GLADE_HOOKUP_OBJECT (assi_step5, frame7, "frame7");
-  GLADE_HOOKUP_OBJECT (assi_step5, vbox13, "vbox13");
-  GLADE_HOOKUP_OBJECT (assi_step5, scrolledwindow7, "scrolledwindow7");
-  GLADE_HOOKUP_OBJECT (assi_step5, textview10, "textview10");
-  GLADE_HOOKUP_OBJECT (assi_step5, hseparator5, "hseparator5");
-  GLADE_HOOKUP_OBJECT (assi_step5, vbox14, "vbox14");
-  GLADE_HOOKUP_OBJECT (assi_step5, vbox15, "vbox15");
-  GLADE_HOOKUP_OBJECT (assi_step5, chkMigr, "chkMigr");
-  GLADE_HOOKUP_OBJECT (assi_step5, hbox53, "hbox53");
-  GLADE_HOOKUP_OBJECT (assi_step5, label84, "label84");
-  GLADE_HOOKUP_OBJECT (assi_step5, entQuota, "entQuota");
-  GLADE_HOOKUP_OBJECT (assi_step5, chkStart, "chkStart");
-  GLADE_HOOKUP_OBJECT (assi_step5, chkEnh, "chkEnh");
-  GLADE_HOOKUP_OBJECT (assi_step5, chkUpdate, "chkUpdate");
-  GLADE_HOOKUP_OBJECT (assi_step5, label43, "label43");
-  GLADE_HOOKUP_OBJECT (assi_step5, hbuttonbox5, "hbuttonbox5");
-  GLADE_HOOKUP_OBJECT (assi_step5, step5_back, "step5_back");
-  GLADE_HOOKUP_OBJECT (assi_step5, alignment37, "alignment37");
-  GLADE_HOOKUP_OBJECT (assi_step5, hbox60, "hbox60");
-  GLADE_HOOKUP_OBJECT (assi_step5, image70, "image70");
-  GLADE_HOOKUP_OBJECT (assi_step5, label91, "label91");
-  GLADE_HOOKUP_OBJECT (assi_step5, step5_next, "step5_next");
-  GLADE_HOOKUP_OBJECT (assi_step5, alignment40, "alignment40");
-  GLADE_HOOKUP_OBJECT (assi_step5, hbox63, "hbox63");
-  GLADE_HOOKUP_OBJECT (assi_step5, image73, "image73");
-  GLADE_HOOKUP_OBJECT (assi_step5, label94, "label94");
-  GLADE_HOOKUP_OBJECT (assi_step5, step5_cancel, "step5_cancel");
-  GLADE_HOOKUP_OBJECT (assi_step5, alignment39, "alignment39");
-  GLADE_HOOKUP_OBJECT (assi_step5, hbox62, "hbox62");
-  GLADE_HOOKUP_OBJECT (assi_step5, image72, "image72");
-  GLADE_HOOKUP_OBJECT (assi_step5, label93, "label93");
-
-  return assi_step5;
-}
-
-GtkWidget*
-create_msgSave (void)
-{
-  GtkWidget *msgSave;
-  GtkWidget *vbox16;
-  GtkWidget *hbox65;
-  GtkWidget *image75;
-  GtkWidget *label96;
-  GtkWidget *hseparator1;
-  GtkWidget *hbuttonbox6;
-  GtkWidget *saveYes;
-  GtkWidget *saveNo;
-
-  msgSave = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (msgSave), _("Question"));
-  gtk_window_set_position (GTK_WINDOW (msgSave), GTK_WIN_POS_CENTER);
-
-  vbox16 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox16);
-  gtk_container_add (GTK_CONTAINER (msgSave), vbox16);
-
-  hbox65 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox65);
-  gtk_box_pack_start (GTK_BOX (vbox16), hbox65, TRUE, TRUE, 0);
-
-  image75 = gtk_image_new_from_stock ("gtk-dialog-question", 
GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image75);
-  gtk_box_pack_start (GTK_BOX (hbox65), image75, FALSE, TRUE, 15);
-  gtk_misc_set_padding (GTK_MISC (image75), 0, 15);
-
-  label96 = gtk_label_new (_("Do you want to save your settings?"));
-  gtk_widget_show (label96);
-  gtk_box_pack_start (GTK_BOX (hbox65), label96, FALSE, FALSE, 5);
-  gtk_label_set_line_wrap (GTK_LABEL (label96), TRUE);
-  gtk_misc_set_padding (GTK_MISC (label96), 0, 15);
-
-  hseparator1 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator1);
-  gtk_box_pack_start (GTK_BOX (vbox16), hseparator1, FALSE, TRUE, 0);
-
-  hbuttonbox6 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox6);
-  gtk_box_pack_start (GTK_BOX (vbox16), hbuttonbox6, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox6), GTK_BUTTONBOX_END);
-
-  saveYes = gtk_button_new_with_mnemonic (_("Yes"));
-  gtk_widget_show (saveYes);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox6), saveYes);
-  GTK_WIDGET_SET_FLAGS (saveYes, GTK_CAN_DEFAULT);
-
-  saveNo = gtk_button_new_with_mnemonic (_("No"));
-  gtk_widget_show (saveNo);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox6), saveNo);
-  GTK_WIDGET_SET_FLAGS (saveNo, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) saveYes, "clicked",
-                    G_CALLBACK (on_saveYes_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) saveNo, "clicked",
-                    G_CALLBACK (on_saveNo_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (msgSave, msgSave, "msgSave");
-  GLADE_HOOKUP_OBJECT (msgSave, vbox16, "vbox16");
-  GLADE_HOOKUP_OBJECT (msgSave, hbox65, "hbox65");
-  GLADE_HOOKUP_OBJECT (msgSave, image75, "image75");
-  GLADE_HOOKUP_OBJECT (msgSave, label96, "label96");
-  GLADE_HOOKUP_OBJECT (msgSave, hseparator1, "hseparator1");
-  GLADE_HOOKUP_OBJECT (msgSave, hbuttonbox6, "hbuttonbox6");
-  GLADE_HOOKUP_OBJECT (msgSave, saveYes, "saveYes");
-  GLADE_HOOKUP_OBJECT (msgSave, saveNo, "saveNo");
-
-  return msgSave;
-}
-
-GtkWidget*
-create_msgSaveFailed (void)
-{
-  GtkWidget *msgSaveFailed;
-  GtkWidget *vbox17;
-  GtkWidget *hbox67;
-  GtkWidget *image77;
-  GtkWidget *label98;
-  GtkWidget *hseparator6;
-  GtkWidget *hbuttonbox7;
-  GtkWidget *button1;
-
-  msgSaveFailed = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (msgSaveFailed), _("Error"));
-  gtk_window_set_position (GTK_WINDOW (msgSaveFailed), GTK_WIN_POS_CENTER);
-
-  vbox17 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox17);
-  gtk_container_add (GTK_CONTAINER (msgSaveFailed), vbox17);
-
-  hbox67 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox67);
-  gtk_box_pack_start (GTK_BOX (vbox17), hbox67, TRUE, TRUE, 0);
-
-  image77 = gtk_image_new_from_stock ("gtk-dialog-error", 
GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image77);
-  gtk_box_pack_start (GTK_BOX (hbox67), image77, FALSE, TRUE, 15);
-  gtk_misc_set_padding (GTK_MISC (image77), 0, 15);
-
-  label98 = gtk_label_new (_("Unable to save configuration!"));
-  gtk_widget_show (label98);
-  gtk_box_pack_start (GTK_BOX (hbox67), label98, FALSE, FALSE, 5);
-  gtk_label_set_line_wrap (GTK_LABEL (label98), TRUE);
-  gtk_misc_set_padding (GTK_MISC (label98), 0, 15);
-
-  hseparator6 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator6);
-  gtk_box_pack_start (GTK_BOX (vbox17), hseparator6, FALSE, TRUE, 0);
-
-  hbuttonbox7 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox7);
-  gtk_box_pack_start (GTK_BOX (vbox17), hbuttonbox7, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox7), GTK_BUTTONBOX_END);
-
-  button1 = gtk_button_new_with_mnemonic (_("OK"));
-  gtk_widget_show (button1);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox7), button1);
-  GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) button1, "clicked",
-                    G_CALLBACK (on_saveFailedOK_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (msgSaveFailed, msgSaveFailed, "msgSaveFailed");
-  GLADE_HOOKUP_OBJECT (msgSaveFailed, vbox17, "vbox17");
-  GLADE_HOOKUP_OBJECT (msgSaveFailed, hbox67, "hbox67");
-  GLADE_HOOKUP_OBJECT (msgSaveFailed, image77, "image77");
-  GLADE_HOOKUP_OBJECT (msgSaveFailed, label98, "label98");
-  GLADE_HOOKUP_OBJECT (msgSaveFailed, hseparator6, "hseparator6");
-  GLADE_HOOKUP_OBJECT (msgSaveFailed, hbuttonbox7, "hbuttonbox7");
-  GLADE_HOOKUP_OBJECT (msgSaveFailed, button1, "button1");
-
-  return msgSaveFailed;
-}
-
-GtkWidget*
-create_assi_step4 (void)
-{
-  GtkWidget *assi_step4;
-  GtkWidget *vbox18;
-  GtkWidget *frame8;
-  GtkWidget *vbox19;
-  GtkWidget *scrolledwindow8;
-  GtkWidget *textview12;
-  GtkWidget *hseparator7;
-  GtkWidget *table3;
-  GtkWidget *label110;
-  GtkWidget *entUser;
-  GtkWidget *entGroup;
-  GtkWidget *label109;
-  GtkWidget *label101;
-  GtkWidget *hbuttonbox8;
-  GtkWidget *step4_back;
-  GtkWidget *alignment43;
-  GtkWidget *hbox70;
-  GtkWidget *image79;
-  GtkWidget *label102;
-  GtkWidget *step4_next;
-  GtkWidget *alignment48;
-  GtkWidget *hbox78;
-  GtkWidget *image84;
-  GtkWidget *label111;
-  GtkWidget *step4_abort;
-  GtkWidget *alignment45;
-  GtkWidget *hbox72;
-  GtkWidget *image81;
-  GtkWidget *label104;
-
-  assi_step4 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (assi_step4, 450, 350);
-  gtk_window_set_title (GTK_WINDOW (assi_step4), _("GNUnet configuration 
assistant"));
-  gtk_window_set_position (GTK_WINDOW (assi_step4), GTK_WIN_POS_CENTER);
-
-  vbox18 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox18);
-  gtk_container_add (GTK_CONTAINER (assi_step4), vbox18);
-
-  frame8 = gtk_frame_new (NULL);
-  gtk_widget_show (frame8);
-  gtk_box_pack_start (GTK_BOX (vbox18), frame8, TRUE, TRUE, 0);
-
-  vbox19 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox19);
-  gtk_container_add (GTK_CONTAINER (frame8), vbox19);
-
-  scrolledwindow8 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow8);
-  gtk_box_pack_start (GTK_BOX (vbox19), scrolledwindow8, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow8), 
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-  textview12 = gtk_text_view_new ();
-  gtk_widget_show (textview12);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow8), textview12);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview12), FALSE);
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview12), GTK_WRAP_WORD);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview12), FALSE);
-  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textview12), 2);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW 
(textview12)), _("Define the user and the group owning the GNUnet service 
here.\n\nFor 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.\n\nHowever, 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.\n\nLeave the fields empty 
to run GNUnet with system privileges."), -1);
-
-  hseparator7 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator7);
-  gtk_box_pack_start (GTK_BOX (vbox19), hseparator7, FALSE, FALSE, 0);
-
-  table3 = gtk_table_new (2, 2, FALSE);
-  gtk_widget_show (table3);
-  gtk_box_pack_start (GTK_BOX (vbox19), table3, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (table3), 5);
-  gtk_table_set_row_spacings (GTK_TABLE (table3), 5);
-  gtk_table_set_col_spacings (GTK_TABLE (table3), 5);
-
-  label110 = gtk_label_new (_("Group:"));
-  gtk_widget_show (label110);
-  gtk_table_attach (GTK_TABLE (table3), label110, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label110), 0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (label110), 5, 0);
-
-  entUser = gtk_entry_new ();
-  gtk_widget_show (entUser);
-  gtk_table_attach (GTK_TABLE (table3), entUser, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entGroup = gtk_entry_new ();
-  gtk_widget_show (entGroup);
-  gtk_table_attach (GTK_TABLE (table3), entGroup, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label109 = gtk_label_new (_("User account:"));
-  gtk_widget_show (label109);
-  gtk_table_attach (GTK_TABLE (table3), label109, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label109), 0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (label109), 5, 0);
-
-  label101 = gtk_label_new (_("Other settings"));
-  gtk_widget_show (label101);
-  gtk_frame_set_label_widget (GTK_FRAME (frame8), label101);
-
-  hbuttonbox8 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox8);
-  gtk_box_pack_start (GTK_BOX (vbox18), hbuttonbox8, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox8), GTK_BUTTONBOX_END);
-
-  step4_back = gtk_button_new ();
-  gtk_widget_show (step4_back);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox8), step4_back);
-  GTK_WIDGET_SET_FLAGS (step4_back, GTK_CAN_DEFAULT);
-
-  alignment43 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment43);
-  gtk_container_add (GTK_CONTAINER (step4_back), alignment43);
-
-  hbox70 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox70);
-  gtk_container_add (GTK_CONTAINER (alignment43), hbox70);
-
-  image79 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image79);
-  gtk_box_pack_start (GTK_BOX (hbox70), image79, FALSE, FALSE, 0);
-
-  label102 = gtk_label_new_with_mnemonic (_("Back"));
-  gtk_widget_show (label102);
-  gtk_box_pack_start (GTK_BOX (hbox70), label102, FALSE, FALSE, 0);
-
-  step4_next = gtk_button_new ();
-  gtk_widget_show (step4_next);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox8), step4_next);
-  GTK_WIDGET_SET_FLAGS (step4_next, GTK_CAN_DEFAULT);
-
-  alignment48 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment48);
-  gtk_container_add (GTK_CONTAINER (step4_next), alignment48);
-
-  hbox78 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox78);
-  gtk_container_add (GTK_CONTAINER (alignment48), hbox78);
-
-  image84 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image84);
-  gtk_box_pack_start (GTK_BOX (hbox78), image84, FALSE, FALSE, 0);
-
-  label111 = gtk_label_new_with_mnemonic (_("Next"));
-  gtk_widget_show (label111);
-  gtk_box_pack_start (GTK_BOX (hbox78), label111, FALSE, FALSE, 0);
-
-  step4_abort = gtk_button_new ();
-  gtk_widget_show (step4_abort);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox8), step4_abort);
-  GTK_WIDGET_SET_FLAGS (step4_abort, GTK_CAN_DEFAULT);
-
-  alignment45 = gtk_alignment_new (0.5, 0.5, 0, 0);
-  gtk_widget_show (alignment45);
-  gtk_container_add (GTK_CONTAINER (step4_abort), alignment45);
-
-  hbox72 = gtk_hbox_new (FALSE, 2);
-  gtk_widget_show (hbox72);
-  gtk_container_add (GTK_CONTAINER (alignment45), hbox72);
-
-  image81 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image81);
-  gtk_box_pack_start (GTK_BOX (hbox72), image81, FALSE, FALSE, 0);
-
-  label104 = gtk_label_new_with_mnemonic (_("Cancel"));
-  gtk_widget_show (label104);
-  gtk_box_pack_start (GTK_BOX (hbox72), label104, FALSE, FALSE, 0);
-
-  g_signal_connect ((gpointer) assi_step4, "destroy",
-                    G_CALLBACK (on_assi_destroy),
-                    NULL);
-  g_signal_connect ((gpointer) entUser, "changed",
-                    G_CALLBACK (on_entUser_changed),
-                    NULL);
-  g_signal_connect ((gpointer) entGroup, "changed",
-                    G_CALLBACK (on_entGroup_changed),
-                    NULL);
-  g_signal_connect ((gpointer) step4_back, "clicked",
-                    G_CALLBACK (on_step4_back_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step4_next, "clicked",
-                    G_CALLBACK (on_step4_next_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) step4_abort, "clicked",
-                    G_CALLBACK (on_abort_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (assi_step4, assi_step4, "assi_step4");
-  GLADE_HOOKUP_OBJECT (assi_step4, vbox18, "vbox18");
-  GLADE_HOOKUP_OBJECT (assi_step4, frame8, "frame8");
-  GLADE_HOOKUP_OBJECT (assi_step4, vbox19, "vbox19");
-  GLADE_HOOKUP_OBJECT (assi_step4, scrolledwindow8, "scrolledwindow8");
-  GLADE_HOOKUP_OBJECT (assi_step4, textview12, "textview12");
-  GLADE_HOOKUP_OBJECT (assi_step4, hseparator7, "hseparator7");
-  GLADE_HOOKUP_OBJECT (assi_step4, table3, "table3");
-  GLADE_HOOKUP_OBJECT (assi_step4, label110, "label110");
-  GLADE_HOOKUP_OBJECT (assi_step4, entUser, "entUser");
-  GLADE_HOOKUP_OBJECT (assi_step4, entGroup, "entGroup");
-  GLADE_HOOKUP_OBJECT (assi_step4, label109, "label109");
-  GLADE_HOOKUP_OBJECT (assi_step4, label101, "label101");
-  GLADE_HOOKUP_OBJECT (assi_step4, hbuttonbox8, "hbuttonbox8");
-  GLADE_HOOKUP_OBJECT (assi_step4, step4_back, "step4_back");
-  GLADE_HOOKUP_OBJECT (assi_step4, alignment43, "alignment43");
-  GLADE_HOOKUP_OBJECT (assi_step4, hbox70, "hbox70");
-  GLADE_HOOKUP_OBJECT (assi_step4, image79, "image79");
-  GLADE_HOOKUP_OBJECT (assi_step4, label102, "label102");
-  GLADE_HOOKUP_OBJECT (assi_step4, step4_next, "step4_next");
-  GLADE_HOOKUP_OBJECT (assi_step4, alignment48, "alignment48");
-  GLADE_HOOKUP_OBJECT (assi_step4, hbox78, "hbox78");
-  GLADE_HOOKUP_OBJECT (assi_step4, image84, "image84");
-  GLADE_HOOKUP_OBJECT (assi_step4, label111, "label111");
-  GLADE_HOOKUP_OBJECT (assi_step4, step4_abort, "step4_abort");
-  GLADE_HOOKUP_OBJECT (assi_step4, alignment45, "alignment45");
-  GLADE_HOOKUP_OBJECT (assi_step4, hbox72, "hbox72");
-  GLADE_HOOKUP_OBJECT (assi_step4, image81, "image81");
-  GLADE_HOOKUP_OBJECT (assi_step4, label104, "label104");
-
-  return assi_step4;
-}
-
-GtkWidget*
-create_msgUpdateFailed (void)
-{
-  GtkWidget *msgUpdateFailed;
-  GtkWidget *vbox20;
-  GtkWidget *hbox79;
-  GtkWidget *image85;
-  GtkWidget *label112;
-  GtkWidget *hseparator8;
-  GtkWidget *hbuttonbox9;
-  GtkWidget *button2;
-
-  msgUpdateFailed = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (msgUpdateFailed), _("Error"));
-  gtk_window_set_position (GTK_WINDOW (msgUpdateFailed), GTK_WIN_POS_CENTER);
-
-  vbox20 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox20);
-  gtk_container_add (GTK_CONTAINER (msgUpdateFailed), vbox20);
-
-  hbox79 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox79);
-  gtk_box_pack_start (GTK_BOX (vbox20), hbox79, TRUE, TRUE, 0);
-
-  image85 = gtk_image_new_from_stock ("gtk-dialog-error", 
GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image85);
-  gtk_box_pack_start (GTK_BOX (hbox79), image85, FALSE, TRUE, 15);
-  gtk_misc_set_padding (GTK_MISC (image85), 0, 15);
-
-  label112 = gtk_label_new (_("gnunet-update failed!"));
-  gtk_widget_show (label112);
-  gtk_box_pack_start (GTK_BOX (hbox79), label112, FALSE, FALSE, 5);
-  gtk_label_set_line_wrap (GTK_LABEL (label112), TRUE);
-  gtk_misc_set_padding (GTK_MISC (label112), 0, 15);
-
-  hseparator8 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator8);
-  gtk_box_pack_start (GTK_BOX (vbox20), hseparator8, FALSE, TRUE, 0);
-
-  hbuttonbox9 = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox9);
-  gtk_box_pack_start (GTK_BOX (vbox20), hbuttonbox9, FALSE, TRUE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox9), GTK_BUTTONBOX_END);
-
-  button2 = gtk_button_new_with_mnemonic (_("OK"));
-  gtk_widget_show (button2);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox9), button2);
-  GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
-
-  g_signal_connect ((gpointer) button2, "clicked",
-                    G_CALLBACK (on_updateFailedOK_clicked),
-                    NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (msgUpdateFailed, msgUpdateFailed, 
"msgUpdateFailed");
-  GLADE_HOOKUP_OBJECT (msgUpdateFailed, vbox20, "vbox20");
-  GLADE_HOOKUP_OBJECT (msgUpdateFailed, hbox79, "hbox79");
-  GLADE_HOOKUP_OBJECT (msgUpdateFailed, image85, "image85");
-  GLADE_HOOKUP_OBJECT (msgUpdateFailed, label112, "label112");
-  GLADE_HOOKUP_OBJECT (msgUpdateFailed, hseparator8, "hseparator8");
-  GLADE_HOOKUP_OBJECT (msgUpdateFailed, hbuttonbox9, "hbuttonbox9");
-  GLADE_HOOKUP_OBJECT (msgUpdateFailed, button2, "button2");
-
-  return msgUpdateFailed;
-}
-

Deleted: GNUnet/src/conf/wizard_interface.h
===================================================================
--- GNUnet/src/conf/wizard_interface.h  2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard_interface.h  2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,12 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-GtkWidget *create_assi_step1 (void);
-GtkWidget *create_assi_step2 (void);
-GtkWidget *create_assi_step3 (void);
-GtkWidget *create_assi_step5 (void);
-GtkWidget *create_msgSave (void);
-GtkWidget *create_msgSaveFailed (void);
-GtkWidget *create_msgUpdateFailed (void);
-GtkWidget *create_assi_step4 (void);

Deleted: GNUnet/src/conf/wizard_support.h
===================================================================
--- GNUnet/src/conf/wizard_support.h    2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/src/conf/wizard_support.h    2006-05-14 08:39:13 UTC (rev 2804)
@@ -1,66 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-
-/*
- * Standard gettext macros.
- */
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (PACKAGE, String)
-#  define Q_(String) g_strip_context ((String), gettext (String))
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define Q_(String) g_strip_context ((String), (String))
-#  define N_(String) (String)
-#endif
-
-
-/*
- * Public Functions.
- */
-
-/*
- * This function returns a widget in a component created by Glade.
- * Call it with the toplevel widget in the component (i.e. a window/dialog),
- * or alternatively any widget in the component, and the name of the widget
- * you want returned.
- */
-GtkWidget *lookup_widget (GtkWidget * widget, const gchar * widget_name);
-
-
-/* Use this function to set the directory containing installed pixmaps. */
-void add_pixmap_directory (const gchar * directory);
-
-
-/*
- * Private Functions.
- */
-
-/* This is used to create the pixmaps used in the interface. */
-GtkWidget *create_pixmap (GtkWidget * widget, const gchar * filename);
-
-/* This is used to create the pixbufs used in the interface. */
-GdkPixbuf *create_pixbuf (const gchar * filename);
-
-/* This is used to set ATK action descriptions. */
-void glade_set_atk_action_description (AtkAction * action,
-                                      const gchar * action_name,
-                                      const gchar * description);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-05-14 06:58:50 UTC (rev 2803)
+++ GNUnet/todo 2006-05-14 08:39:13 UTC (rev 2804)
@@ -11,9 +11,6 @@
   Oh, and this is of course just a plan.  And plans always change.
 
 
-0.7.0d:
-* #1025
-
 0.7.1 ['06] (aka "stabilization")
 - known bugs (see Mantis for updates):
   * gnunet-setup memory leaks (#878)





reply via email to

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